merge

bzr revid: fp@tinyerp.com-20090803070156-38o2tyzljrlsuh84
author: Fabien Pinckaers <fp@tinyerp.com> 2009-08-03 09:01:56 +0200
committer: Fabien Pinckaers <fp@tinyerp.com> 2009-08-03 09:01:56 +0200
commit: 5ebd3bc12cb0940d95dbfeb78e60e5a4ce174d06 (patch)
tree: fbbea591e5cd0659abc53f92d24adba143dc45f0 /addons
parent: 3472508614e7ee985d8f87faf4e6a658d5bdca56 (diff)
parent: 738dc7153439aa6a02a35a23449214265547e516 (diff)
148 files changed, 3702 insertions, 3606 deletions
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 3da8436a1da..5b06a40acb1 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -482,7 +482,7 @@
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','out_invoice')]</field>
+            <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]</field>
             <field name="context">{'type':'out_invoice'}</field>
         </record>
         <record id="action_invoice_tree7_view1" model="ir.actions.act_window.view">
@@ -526,7 +526,7 @@
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','in_invoice')]</field>
+            <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_invoice')]</field>
             <field name="context">{'type':'in_invoice'}</field>
         </record>
         <record id="action_invoice_tree9_view1" model="ir.actions.act_window.view">
@@ -570,7 +570,7 @@
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','out_refund')]</field>
+            <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_refund')]</field>
             <field name="context">{'type':'out_refund'}</field>
         </record>
         <record id="action_invoice_tree11_view1" model="ir.actions.act_window.view">
@@ -614,7 +614,7 @@
             <field name="res_model">account.invoice</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form,calendar,graph</field>
-            <field name="domain">[('state','!=','draft'),('reconciled','=',False),('type','=','in_refund')]</field>
+            <field name="domain">[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','in_refund')]</field>
             <field name="context">{'type':'in_refund'}</field>
         </record>
         <record id="action_invoice_tree13_view1" model="ir.actions.act_window.view">
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 902fe5523bb..c2d474a3441 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -573,7 +573,7 @@ class account_move_line(osv.osv):
             raise osv.except_osv(_('Error'), _('Entry is already reconciled'))
         account = self.pool.get('account.account').browse(cr, uid, account_id, context=context)
         if not context.get('fy_closing', False) and not account.reconcile:
-            raise osv.except_osv(_('Error'), _('The account is not defined to be reconcile !'))
+            raise osv.except_osv(_('Error'), _('The account is not defined to be reconciled !'))
         if r[0][1] != None:
             raise osv.except_osv(_('Error'), _('Some entries are already reconciled !'))
 
@@ -837,7 +837,7 @@ class account_move_line(osv.osv):
             if journal.type_control_ids:
                 type = account.user_type
                 for t in journal.type_control_ids:
-                    if type==t.code:
+                    if type.code == t.code:
                         ok = True
                         break
             if journal.account_control_ids and not ok:
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ebb0c4ff0cd..60ca4626033 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -845,7 +845,8 @@
 
                             <field name="debit" select="1"/>
                             <field name="credit" select="1"/>
-
+							<field name="date" select="1"/>
+							
                             <separator colspan="4" string="Optional Information"/>
                             <field name="currency_id"/>
                             <field name="amount_currency"/>
diff --git a/addons/account/i18n/fr_FR.po b/addons/account/i18n/fr_FR.po
index 3fa59da7dcd..12f57f2f421 100644
--- a/addons/account/i18n/fr_FR.po
+++ b/addons/account/i18n/fr_FR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
-"PO-Revision-Date: 2009-06-05 12:12+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2009-06-12 11:04+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-05 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:13+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -103,7 +103,7 @@ msgstr "Résultat du lettrage"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 msgid "Unreconciled entries"
-msgstr "Écritures non réconciliées"
+msgstr "Ecritures non-lettrées"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -151,7 +151,7 @@ msgstr "Coefficient multiplicateur"
 #: model:ir.actions.wizard,name:account.wizard_unreconcile_select
 #: model:ir.ui.menu,name:account.menu_unreconcile_select
 msgid "Unreconcile entries"
-msgstr "Écritures non réconciliées"
+msgstr "Ecritures non-lettrées"
 
 #. module: account
 #: constraint:account.period:0
@@ -224,7 +224,7 @@ msgid ""
 "You should set the journal to allow cancelling entries if you want to do "
 "that."
 msgstr ""
-"Vous ne pouvez pas modifier une écriture postée dans ce journal !\n"
+"Vous ne pouvez pas modifier une entrée postée dans ce journal !\n"
 "Vous devez modifier le journal pour permettre l'annulation des écritures si "
 "vous voulez permettre cela."
 
@@ -271,7 +271,7 @@ msgstr "Echéancier"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurrent Entries"
-msgstr "Écritures réccurentes"
+msgstr "Ecritures réccurentes"
 
 #. module: account
 #: field:account.analytic.line,amount:0
@@ -774,7 +774,7 @@ msgstr "Remise (%)"
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "You can not add/modify entries in a closed journal."
-msgstr "Vous ne pouvez pas ajouter/modifier les écritures dans un journal cloturé."
+msgstr "Vous ne pouvez pas ajouter/modifier un journal cloturé."
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -1154,7 +1154,7 @@ msgstr "Compte de débit par défaut"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Entries by Statements"
-msgstr "Écritures par état"
+msgstr "Ecritures par état"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1336,7 +1336,7 @@ msgstr "Prix unitaire"
 #. module: account
 #: model:ir.actions.wizard,name:account.action_move_journal_line_form_select
 msgid "Standard entry"
-msgstr "Écriture standard"
+msgstr "Entrée standard"
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -1609,7 +1609,7 @@ msgstr "Séquences"
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
-msgstr "Calculer les dates d'Écriture"
+msgstr "Calculer les dates d'entrée"
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -1958,7 +1958,7 @@ msgstr "Delta de crédit"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr "Écritures non réconciliées"
+msgstr "Écritures non lettrées"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2425,7 +2425,7 @@ msgstr "Montant"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr "Écritures réconciliées"
+msgstr "Ecritures lettrées"
 
 #. module: account
 #: field:account.invoice,address_contact_id:0
@@ -2629,7 +2629,7 @@ msgstr "Type de Taxe"
 #. module: account
 #: model:process.transition,name:account.process_transition_statemententries0
 msgid "Statement Entries"
-msgstr "Écritures du relevé"
+msgstr "Entrées du relevé"
 
 #. module: account
 #: code:addons/account/wizard/wizard_fiscalyear_close.py:0
@@ -2673,7 +2673,7 @@ msgstr "Importer une facture"
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Some entries are already reconciled !"
-msgstr "Des écritures semblent déjà réconciliées !"
+msgstr "Des écritures semblent déjà lettrées !"
 
 #. module: account
 #: wizard_view:account.analytic.account.quantity_cost_ledger.report,init:0
@@ -2809,7 +2809,7 @@ msgstr "Informations supplémentaires"
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Entries Reconcile"
-msgstr "Écritures réconciliées"
+msgstr "Ecritures lettrées"
 
 #. module: account
 #: help:account.bank.statement.reconcile,total_second_amount:0
@@ -2944,7 +2944,7 @@ msgstr "Ordre de Paiement"
 msgid ""
 "Check this option if you want the user to reconcile entries in this account."
 msgstr ""
-"Cochez cette case si vous voulez que l'utilisateur réconcilie les Écritures "
+"Cochez cette case si vous voulez que l'utilisateur réconcilie les entrées "
 "dans ce compte."
 
 #. module: account
@@ -2997,7 +2997,7 @@ msgid ""
 "accounts."
 msgstr ""
 "Ce type est utilisé pour différencier les types qui ont un effet spécial "
-"dans Open ERP: les \"vues\" ne peuvent pas posséder d'écriture, "
+"dans Open ERP: les \"vues\" ne peuvent pas posséder d'entrées, "
 "\"consolidation\" veut dire les comptes qui peuvent avoir des comptes fils "
 "pour les consolidations des multi-sociétés, payable/recevable sont pour les "
 "comptes partenaire (pour le calcul des débits/crédits), \"fermé\" pour les "
@@ -3240,7 +3240,7 @@ msgstr "Compte de taxe"
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid "From statement, create entries"
-msgstr "Depuis le relevé, créer des Écritures"
+msgstr "Depuis le relevé, créer des entrées"
 
 #. module: account
 #: field:account.analytic.account,complete_name:0
@@ -3393,8 +3393,8 @@ msgid ""
 "between the date of the creation action or the the date of the creation of "
 "the entries plus the partner payment terms."
 msgstr ""
-"La date d'échéance de l'écriture générée pour ce modèle. Vous pouvez choisir "
-"entre la date de création de l'action ou la date de création des écritures "
+"La date d'échéance de l'entrée générée pour ce modèle. Vous pouvez choisir "
+"entre la date de création de l'action ou la date de création des entrées "
 "plus les conditions de règlement du partenaire."
 
 #. module: account
@@ -3421,7 +3421,7 @@ msgstr "Document"
 #. module: account
 #: help:account.move.line,move_id:0
 msgid "The move of this entry line."
-msgstr "Le mouvement de cette ligne d'écriture."
+msgstr "Le mouvement de cette ligne d'entrée."
 
 #. module: account
 #: field:account.invoice.line,uos_id:0
@@ -3882,7 +3882,7 @@ msgid ""
 "All draft account entries in this journal and period will be validated. It "
 "means you won't be able to modify their accouting fields."
 msgstr ""
-"Toutes les écritures de comptes brouillon dans ce journal et cette période "
+"Toutes les entrées de comptes brouillon dans ce journal et cette période "
 "seront validées. Cela veut dire que vous ne pourrez plus modifier leurs "
 "champs de compte."
 
@@ -3898,7 +3898,7 @@ msgid ""
 "The amount expressed in an optional other currency if it is a multi-currency "
 "entry."
 msgstr ""
-"Le montant exprimé dans une autre devise optionnelle si c'est une écriture "
+"Le montant exprimé dans une autre devise optionnelle si c'est une entrée "
 "multi devise."
 
 #. module: account
@@ -4161,7 +4161,7 @@ msgstr ""
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Global taxes defined, but are not in invoice lines !"
-msgstr "Taxes globales définies, mais elles ne sont pas dans les lignes de facture !"
+msgstr ""
 
 #. module: account
 #: selection:account.config.wizard,period:0
@@ -4234,7 +4234,7 @@ msgstr "Date de facture"
 #: code:addons/account/wizard/wizard_fiscalyear_close.py:0
 #, python-format
 msgid "The old fiscal year does not have any entry to reconcile!"
-msgstr "L'ancienne année fiscale n'a pas d'écriture à réconcilier !"
+msgstr "L'ancienne année fiscale n'a pas d'entrées à réconcilier !"
 
 #. module: account
 #: code:addons/account/wizard/wizard_fiscalyear_close.py:0
@@ -4565,7 +4565,7 @@ msgid ""
 "You can check this box to mark the entry line as a litigation with the "
 "associated partner"
 msgstr ""
-"Vous pouvez cocher cette boîte pour marquer la ligne d'écriture comme un "
+"Vous pouvez cocher cette boîte pour marquer la ligne d'entrée comme un "
 "litige avec le partenaire associé"
 
 #. module: account
@@ -4713,7 +4713,7 @@ msgid ""
 "date for the payment of this entry line."
 msgstr ""
 "Ce champ est utilisé pour les écritures à payer et à recevoir. Vous pouvez "
-"mettre la date limite pour le règlement de cette ligne d'écriture."
+"mettre la date limite pour le règlement de cette ligne d'entrée."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -4942,7 +4942,7 @@ msgstr "Modèle de compte de taxe"
 #. module: account
 #: help:account.model,name:0
 msgid "This is a model for recurring accounting entries"
-msgstr "Ceci est un modèle pour des écritures comptable récurrentes"
+msgstr "Ceci est un modèle pour des entrées comptable récurrentes"
 
 #. module: account
 #: wizard_view:account.wizard_paid_open,init:0
@@ -4967,7 +4967,7 @@ msgstr "Débit fournisseur"
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries"
-msgstr "La quantité optionelle des écritures"
+msgstr "La quantité optionelle des entrées"
 
 #. module: account
 #: rml:account.third_party_ledger:0
@@ -5122,13 +5122,13 @@ msgstr "La taxe est comprise dans le prix indiqué"
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree2
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Entries by Journal"
-msgstr "Écritures analytiques par journal"
+msgstr "Entrées analytiques par journal"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Valid entries from invoice"
-msgstr "Écritures valides de la Facture"
+msgstr "Entrées valides de la Facture"
 
 #. module: account
 #: field:account.account,company_id:0
@@ -5298,7 +5298,7 @@ msgstr "Adresse de facturation"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Credit"
-msgstr "Crédit Général"
+msgstr ""
 
 #. module: account
 #: code:addons/account/invoice.py:0
@@ -5317,7 +5317,7 @@ msgid ""
 "new counterpart but will share the same counterpart. This is used in fiscal "
 "year closing."
 msgstr ""
-"Cochez cette case pour spécifier que chaque écriture de ce journal ne créera "
+"Cochez cette case pour spécifier que chaque entrée de ce journal ne créera "
 "pas une nouvelle contrepartie mais partagera la même contrepartie. Cela est "
 "utilisé dans la clôture des années fiscales."
 
@@ -5546,7 +5546,7 @@ msgstr "Début de la Période"
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,report_name:0
 msgid "Name of new entries"
-msgstr "Nom des nouvelles écritures"
+msgstr "Nom des nouvelles entrées"
 
 #. module: account
 #: wizard_button:account_use_models,init_form,create:0
@@ -5818,7 +5818,7 @@ msgstr "Cette période est déjà cloturée !"
 #. module: account
 #: help:account.move.line,currency_id:0
 msgid "The optional other currency if it is a multi-currency entry."
-msgstr "L'autre devise optionelle si c'est une écriture multi devise."
+msgstr "L'autre devise optionelle si c'est une entrée multi devise."
 
 #. module: account
 #: view:account.invoice:0
@@ -5858,7 +5858,7 @@ msgstr "Non"
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move
 msgid "All account entries"
-msgstr "Toutes les écritures de compte"
+msgstr "Toutes les entrées de compte"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -5927,7 +5927,7 @@ msgstr "PRO-FORMA"
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr "Lignes d'Écriture Partielle"
+msgstr "Lignes d'Entrée Partielle"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5948,7 +5948,7 @@ msgstr "Encodage standard"
 #. module: account
 #: wizard_button:account.analytic.line,init,open:0
 msgid "Open Entries"
-msgstr "Écritures Ouvertes"
+msgstr "Entrées Ouvertes"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -6154,7 +6154,7 @@ msgstr "Définition du Journal Analytique"
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Created Entries"
-msgstr "Omettre l'état 'Brouillon' pour les Écritures Créées"
+msgstr "Omettre l'état 'Brouillon' pour les Entrées Créées"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
@@ -6253,7 +6253,7 @@ msgstr "Vous devez définir un journal analytique sur le journal '%s' !"
 #. module: account
 #: wizard_view:account.move.validate,init:0
 msgid "Validate Account Entries"
-msgstr "Valider les Écritures du Compte"
+msgstr "Valider les Entrées du Compte"
 
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
@@ -6274,7 +6274,7 @@ msgstr "au"
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 msgid "Entries of Open Analytic Journals"
-msgstr "Écritures des Journaux Analytiques Ouverts"
+msgstr "Entrées des Journaux Analytiques Ouverts"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -6459,7 +6459,7 @@ msgstr "account.sequence.fiscalyear"
 #. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
 msgid "Entries Sorted By"
-msgstr "Écritures triées par"
+msgstr "Entrées triées par"
 
 #. module: account
 #: rml:account.journal.period.print:0
@@ -6531,12 +6531,12 @@ msgstr "Note de Crédit Fournisseur"
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Reconcile Entries."
-msgstr "Réconcilier les Écritures."
+msgstr "Réconcilier les Entrées."
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "Écriture"
+msgstr "Entrée"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
@@ -6591,12 +6591,12 @@ msgstr "Détails de banque"
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr "Compte de Dépense sur les Modèles de Produits"
+msgstr ""
 
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "General Debit"
-msgstr "Débit Général"
+msgstr ""
 
 #. module: account
 #: field:account.analytic.account,code:0
@@ -6692,7 +6692,7 @@ msgstr "Oui"
 msgid ""
 "Check this if the user is allowed to reconcile entries in this account."
 msgstr ""
-"Cochez cette case si l'utilisateur peut réconcilier les Écritures dans ce "
+"Cochez cette case si l'utilisateur peut réconcilier les entrées dans ce "
 "compte."
 
 #. module: account
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 2bbd2e92207..9814214786a 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -772,7 +772,7 @@ class account_invoice(osv.osv):
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context)
 
-    def _refund_cleanup_lines(self, lines):
+    def _refund_cleanup_lines(self, cr, uid, lines):
         for line in lines:
             del line['id']
             del line['invoice_id']
@@ -810,11 +810,11 @@ class account_invoice(osv.osv):
 
 
             invoice_lines = self.pool.get('account.invoice.line').read(cr, uid, invoice['invoice_line'])
-            invoice_lines = self._refund_cleanup_lines(invoice_lines)
+            invoice_lines = self._refund_cleanup_lines(cr, uid, invoice_lines)
 
             tax_lines = self.pool.get('account.invoice.tax').read(cr, uid, invoice['tax_line'])
             tax_lines = filter(lambda l: l['manual'], tax_lines)
-            tax_lines = self._refund_cleanup_lines(tax_lines)
+            tax_lines = self._refund_cleanup_lines(cr, uid, tax_lines)
             if not date :
                 date = time.strftime('%Y-%m-%d')
             invoice.update({
@@ -880,7 +880,7 @@ class account_invoice(osv.osv):
 
         lines = [(0, 0, l1), (0, 0, l2)]
         move = {'ref': invoice.number, 'line_id': lines, 'journal_id': pay_journal_id, 'period_id': period_id, 'date': date}
-        move_id = self.pool.get('account.move').create(cr, uid, move)
+        move_id = self.pool.get('account.move').create(cr, uid, move, context=context)
 
         line_ids = []
         total = 0.0
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 7fea81087aa..5dce667920e 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -86,3 +86,6 @@
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
+"access_wizard_company_setup_manager","wizard.company.setup manager","model_wizard_company_setup","account.group_account_manager",1,1,1,1
+"access_wizard_company_setup","wizard.company.setup","model_wizard_company_setup","account.group_account_user",1,0,0,0
+"access_wizard_company_setup_user","wizard.company.setup user","model_wizard_company_setup","base.group_user",1,0,0,0
diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 4350f0a42b8..30c6f98d6a2 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -35,7 +35,7 @@ class account_analytic_account(osv.osv):
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         if ids2:
             acc_set = ",".join(map(str, ids2))
-            cr.execute("select account_analytic_line.account_id, sum(amount) \
+            cr.execute("select account_analytic_line.account_id, COALESCE(sum(amount),0.0) \
                     from account_analytic_line \
                     join account_analytic_journal \
                         on account_analytic_line.journal_id = account_analytic_journal.id  \
@@ -62,9 +62,9 @@ class account_analytic_account(osv.osv):
             # Amount uninvoiced hours to invoice at sale price
             acc_set = ",".join(map(str, ids2))
             cr.execute("""SELECT account_analytic_account.id, \
-                        sum (product_template.list_price * \
+                        COALESCE(sum (product_template.list_price * \
                             account_analytic_line.unit_amount * \
-                            ((100-hr_timesheet_invoice_factor.factor)/100)) \
+                            ((100-hr_timesheet_invoice_factor.factor)/100)),0.0) \
                             AS ca_to_invoice \
                     FROM product_template \
                     join product_product \
@@ -114,7 +114,7 @@ class account_analytic_account(osv.osv):
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         if ids2:
             acc_set = ",".join(map(str, ids2))
-            cr.execute("select account_analytic_line.account_id, sum(unit_amount) \
+            cr.execute("select account_analytic_line.account_id, COALESCE(sum(unit_amount),0.0) \
                     from account_analytic_line \
                     join account_analytic_journal \
                         on account_analytic_line.journal_id = account_analytic_journal.id \
@@ -140,14 +140,15 @@ class account_analytic_account(osv.osv):
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         if ids2:
             acc_set = ",".join(map(str, ids2))
-            cr.execute("select account_analytic_line.account_id,sum(unit_amount) \
+            cr.execute("select account_analytic_line.account_id,COALESCE(SUM(unit_amount),0.0) \
                     from account_analytic_line \
                     join account_analytic_journal \
                         on account_analytic_line.journal_id = account_analytic_journal.id \
                     where account_analytic_line.account_id IN (%s) \
                         and account_analytic_journal.type='general' \
                     GROUP BY account_analytic_line.account_id"%acc_set)
-            for account_id, sum in cr.fetchall():
+            ff =  cr.fetchall()
+            for account_id, sum in ff:
                 res[account_id] = round(sum,2)
         for obj_id in ids:
             res.setdefault(obj_id, 0.0)
@@ -164,7 +165,7 @@ class account_analytic_account(osv.osv):
         ids2 = self.search(cr, uid, [('parent_id', 'child_of', ids)])
         if ids2:
             acc_set = ",".join(map(str, ids2))
-            cr.execute("""select account_analytic_line.account_id,sum(amount) \
+            cr.execute("""select account_analytic_line.account_id,COALESCE(sum(amount),0.0) \
                     from account_analytic_line \
                     join account_analytic_journal \
                         on account_analytic_line.journal_id = account_analytic_journal.id \
@@ -190,9 +191,9 @@ class account_analytic_account(osv.osv):
         if ids2:
             acc_set = ",".join(map(str, ids2))
             cr.execute("""select account_analytic_line.account_id as account_id, \
-                        sum((account_analytic_line.unit_amount * pt.list_price) \
+                        COALESCE(sum((account_analytic_line.unit_amount * pt.list_price) \
                             - (account_analytic_line.unit_amount * pt.list_price \
-                                * hr.factor)) as somme
+                                * hr.factor)),0.0) as somme
                     from account_analytic_line \
                     left join account_analytic_journal \
                         on (account_analytic_line.journal_id = account_analytic_journal.id) \
@@ -584,7 +585,7 @@ class account_analytic_account_summary_month(osv.osv):
     _description = "Hours summary by month"
     _auto = False
     _rec_name = 'month'
-    _order = 'month'
+#    _order = 'month'
 
     def _unit_amount(self, cr, uid, ids, name, arg, context=None):
         res = {}
diff --git a/addons/account_analytic_analysis/i18n/fr_FR.po b/addons/account_analytic_analysis/i18n/fr_FR.po
index 7e8c4ca7d3c..94baf4c1325 100644
--- a/addons/account_analytic_analysis/i18n/fr_FR.po
+++ b/addons/account_analytic_analysis/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 10:58+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 11:04+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/fr_FR.po b/addons/account_analytic_default/i18n/fr_FR.po
index 9e725596de8..888dad55230 100644
--- a/addons/account_analytic_default/i18n/fr_FR.po
+++ b/addons/account_analytic_default/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 11:00+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 11:08+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/fr_FR.po b/addons/account_analytic_plans/i18n/fr_FR.po
index 2905868e4ed..0229707a14e 100644
--- a/addons/account_analytic_plans/i18n/fr_FR.po
+++ b/addons/account_analytic_plans/i18n/fr_FR.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
-"PO-Revision-Date: 2009-06-12 12:32+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2009-07-07 07:24+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 12:48+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -315,7 +315,7 @@ msgstr ""
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
 msgid "Multiple-plans management in Analytic Accounting"
-msgstr "Gestion de plusieurs plans dans la comptabilité analytique"
+msgstr "Gestion de plans multiples dans la comptabilité analytique"
 
 #. module: account_analytic_plans
 #: view:account.analytic.plan.line:0
diff --git a/addons/account_balance/i18n/fr_FR.po b/addons/account_balance/i18n/fr_FR.po
index d5d563ecbdc..93a58425a22 100644
--- a/addons/account_balance/i18n/fr_FR.po
+++ b/addons/account_balance/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 11:29+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 11:36+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
diff --git a/addons/account_budget/i18n/fr_FR.po b/addons/account_budget/i18n/fr_FR.po
index ad2abbb9352..2526effa031 100644
--- a/addons/account_budget/i18n/fr_FR.po
+++ b/addons/account_budget/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 11:10+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 11:20+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_chart/i18n/fr_FR.po b/addons/account_chart/i18n/fr_FR.po
index 793e6bafba2..8832ddedab7 100644
--- a/addons/account_chart/i18n/fr_FR.po
+++ b/addons/account_chart/i18n/fr_FR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:02+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-06-12 13:12+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_chart
diff --git a/addons/account_date_check/i18n/fr_FR.po b/addons/account_date_check/i18n/fr_FR.po
index f59cf066c15..8f6d4fd939c 100644
--- a/addons/account_date_check/i18n/fr_FR.po
+++ b/addons/account_date_check/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 13:15+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 13:28+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:18+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_date_check
diff --git a/addons/account_followup/i18n/fr_FR.po b/addons/account_followup/i18n/fr_FR.po
index 34add298c89..c2ef6a3df35 100644
--- a/addons/account_followup/i18n/fr_FR.po
+++ b/addons/account_followup/i18n/fr_FR.po
@@ -6,19 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-06-12 13:18+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Date :"
-msgstr ""
+msgstr "Date :"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,partner_ids:0
@@ -28,7 +29,7 @@ msgstr "Partenaires"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Customer Ref :"
-msgstr ""
+msgstr "Réf. Client"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -39,7 +40,7 @@ msgstr "Toutes les entrées payables"
 #. module: account_followup
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom du Modèle non valide dans la définition de l'action."
 
 #. module: account_followup
 #: field:account_followup.followup.line,description:0
@@ -54,7 +55,7 @@ msgstr "Total débit"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Amount In Currency"
-msgstr ""
+msgstr "Montant en Devise"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -86,13 +87,18 @@ msgstr "Débit"
 #. module: account_followup
 #: code:addons/account_followup/wizard/wizard_followup_print.py:0
 #, python-format
-msgid "Mail not sent to following Partners, Email not available !\n\n"
+msgid ""
+"Mail not sent to following Partners, Email not available !\n"
+"\n"
 msgstr ""
+"Un courriel n'a pas été envoyé aux Partenaires suivants, l'adresse n'est pas "
+"disponible !\n"
+"\n"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Email Settings"
-msgstr ""
+msgstr "Paramètres du Courriel"
 
 #. module: account_followup
 #: field:account_followup.stat,account_type:0
@@ -118,8 +124,16 @@ msgstr "%(date)s: Date Courante"
 #. module: account_followup
 #: code:addons/account_followup/wizard/wizard_followup_print.py:0
 #, python-format
-msgid "\n\nMail sent to following Partners successfully, !\n\n"
+msgid ""
+"\n"
+"\n"
+"Mail sent to following Partners successfully, !\n"
+"\n"
 msgstr ""
+"\n"
+"\n"
+"Courriel envoyé avec succès aux Partenaires suivants,\n"
+"\n"
 
 #. module: account_followup
 #: field:account.move.line,followup_date:0
@@ -135,7 +149,7 @@ msgstr "Suivis"
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,init,date:0
 msgid "Follow-up Sending Date"
-msgstr ""
+msgstr "Date d'envoi de la Relance"
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -162,7 +176,7 @@ msgstr "Entreprise"
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Date de Facturation"
 
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,next,email_subject:0
@@ -176,8 +190,11 @@ msgstr "Payé"
 
 #. module: account_followup
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -202,7 +219,7 @@ msgstr "Critère de relance"
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "Partner Selection"
-msgstr ""
+msgstr "Sélection d'un Partenaire"
 
 #. module: account_followup
 #: constraint:ir.ui.view:0
@@ -217,7 +234,7 @@ msgstr "Type de terme"
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,init:0
 msgid "Follow-up and Date Selection"
-msgstr ""
+msgstr "Sélection de la Relance et de la Date"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
@@ -231,21 +248,26 @@ msgstr "Lit."
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line1
-msgid "\n"
+msgid ""
+"\n"
 "Dear %(partner_name)s,\n"
 "\n"
-"Exception made if there was a mistake of ours, it seems that the following amount staid unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount staid unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
 "\n"
-"Would your payment have been carried out after this mail was sent, please consider the present one as void. Do not hesitate to contact our accounting department at (+32).10.68.94.39.\n"
+"Would your payment have been carried out after this mail was sent, please "
+"consider the present one as void. Do not hesitate to contact our accounting "
+"department at (+32).10.68.94.39.\n"
 "\n"
 "Best Regards,\n"
-"			"
+"\t\t\t"
 msgstr ""
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,summary,end:0
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #. module: account_followup
 #: field:account_followup.followup,name:0
@@ -267,7 +289,7 @@ msgstr "Fin de mois"
 #: view:account_followup.followup.line:0
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(company_name)s: User's Company name"
-msgstr ""
+msgstr "%(company_name)s: nom de la société de l'utilisateur"
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_all
@@ -309,18 +331,18 @@ msgstr "Continuer"
 #. module: account_followup
 #: model:ir.module.module,shortdesc:account_followup.module_meta_information
 msgid "Accounting follow-ups management"
-msgstr ""
+msgstr "Gestion des Relances Comptables"
 
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,summary:0
 #: wizard_field:account_followup.followup.print.all,summary,summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Résumé"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Lines"
-msgstr ""
+msgstr "Lignes de Relances"
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
@@ -335,7 +357,7 @@ msgstr "Lignes de rappel"
 #. module: account_followup
 #: wizard_view:account_followup.followup.print.all,next:0
 msgid "%(company_currency)s: User's Company Currency"
-msgstr ""
+msgstr "%(company_currency)s: Devise de la société de l'utilisateur"
 
 #. module: account_followup
 #: field:account_followup.stat,balance:0
@@ -344,8 +366,10 @@ msgstr "Balance"
 
 #. module: account_followup
 #: help:account_followup.followup.print.all,init,date:0
-msgid "This field allow you to select a forecast date to plan your follow-ups"
+msgid ""
+"This field allow you to select a forecast date to plan your follow-ups"
 msgstr ""
+"Ce champ vous permet de sélectionner une date pour planifier vos relances"
 
 #. module: account_followup
 #: view:account.move.line:0
@@ -354,20 +378,27 @@ msgstr "Total crédit"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line2
-msgid "\n"
+msgid ""
+"\n"
 "Dear %(partner_name)s,\n"
 "\n"
-"We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.\n"
+"We are disappointed to see that despite sending a reminder, that your "
+"account is now seriously overdue.\n"
 "\n"
-"It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services).\n"
-"Please, take appropriate measures in order to carry out this payment in the next 8 days\n"
+"It is essential that immediate payment is made, otherwise we will have to "
+"consider placing a stop on your account which means that we will no longer "
+"be able to supply your company with (goods/services).\n"
+"Please, take appropriate measures in order to carry out this payment in the "
+"next 8 days\n"
 "\n"
-"If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department at (+32).10.68.94.39. so that we can resolve the matter quickly.\n"
+"If there is a problem with paying invoice that we are not aware of, do not "
+"hesitate to contact our accounting department at (+32).10.68.94.39. so that "
+"we can resolve the matter quickly.\n"
 "\n"
 "Details of due payments is printed below.\n"
 "\n"
 "Best Regards,\n"
-"			"
+"\t\t\t"
 msgstr ""
 
 #. module: account_followup
@@ -412,25 +443,29 @@ msgstr "Rapport des Relances"
 
 #. module: account_followup
 #: model:account_followup.followup.line,description:account_followup.demo_followup_line3
-msgid "\n"
+msgid ""
+"\n"
 "Dear %(partner_name)s,\n"
 "\n"
 "Despite several reminders, your account is still not settled.\n"
 "\n"
-"Unless full payment is made in next 8 days , then legal action for the recovery of the debt, will be taken without further notice.\n"
+"Unless full payment is made in next 8 days , then legal action for the "
+"recovery of the debt, will be taken without further notice.\n"
 "\n"
-"I trust that this action will prove unnecessary and details of due payments is printed below.\n"
+"I trust that this action will prove unnecessary and details of due payments "
+"is printed below.\n"
 "\n"
-"In case of any queries concerning this matter, do not hesitate to contact our accounting department at (+32).10.68.94.39.\n"
+"In case of any queries concerning this matter, do not hesitate to contact "
+"our accounting department at (+32).10.68.94.39.\n"
 "\n"
 "Best Regards,\n"
-"			"
+"\t\t\t"
 msgstr ""
 
 #. module: account_followup
 #: rml:account_followup.followup.print:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Date de Maturité"
 
 #. module: account_followup
 #: view:account_followup.followup.line:0
@@ -462,7 +497,7 @@ msgstr "Envoyer un Message de confirmation"
 #. module: account_followup
 #: wizard_field:account_followup.followup.print.all,init,followup_id:0
 msgid "Follow-up"
-msgstr ""
+msgstr "Relance"
 
 #. module: account_followup
 #: field:account_followup.stat,name:0
@@ -483,11 +518,14 @@ msgstr "Jour de délais"
 #. module: account_followup
 #: code:addons/account_followup/wizard/wizard_followup_print.py:0
 #, python-format
-msgid "All emails have been successfully sent to Partners:.\n\n"
+msgid ""
+"All emails have been successfully sent to Partners:.\n"
+"\n"
 msgstr ""
+"Tous les courriels ont été envoyés avec succès aux Partenaires :.\n"
+"\n"
 
 #. module: account_followup
 #: wizard_button:account_followup.followup.print.all,next,print:0
 msgid "Print Follow Ups & Send Mails"
-msgstr ""
-
+msgstr "Imprimer les Relances et envoyer les Courriels"
diff --git a/addons/account_invoice_layout/i18n/fr_FR.po b/addons/account_invoice_layout/i18n/fr_FR.po
index d92ce2d43d2..6583fd448ed 100644
--- a/addons/account_invoice_layout/i18n/fr_FR.po
+++ b/addons/account_invoice_layout/i18n/fr_FR.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
-"PO-Revision-Date: 2009-06-12 13:09+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2009-07-07 13:36+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 13:20+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 13:44+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -165,7 +165,7 @@ msgstr "Message Spécial"
 #. module: account_invoice_layout
 #: view:notify.message:0
 msgid "Write a notification or a wishful message."
-msgstr ""
+msgstr "Ecrire un avis"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
diff --git a/addons/account_payment/i18n/fr_FR.po b/addons/account_payment/i18n/fr_FR.po
index dc618ce115c..9101b27f30a 100644
--- a/addons/account_payment/i18n/fr_FR.po
+++ b/addons/account_payment/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:36+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
 #: field:payment.order,date_planned:0
@@ -49,14 +50,18 @@ msgstr "Compte du Partenaire principal"
 
 #. module: account_payment
 #: help:account.invoice,amount_to_pay:0
-msgid "The amount which should be paid at the current date\n"
+msgid ""
+"The amount which should be paid at the current date\n"
 "minus the amount which is already in payment order"
-msgstr "Le montant qui doit être payé à la date courante\n"
+msgstr ""
+"Le montant qui doit être payé à la date courante\n"
 "moins le montant qui se trouve déjà dans l'ordre de paiement"
 
 #. module: account_payment
 #: help:payment.line,date:0
-msgid "If no payment date is specified, the bank will treat this payment line directly"
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
 msgstr ""
 
 #. module: account_payment
@@ -206,7 +211,10 @@ msgstr ""
 
 #. module: account_payment
 #: help:payment.order,date_prefered:0
-msgid "Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
 msgstr ""
 
 #. module: account_payment
@@ -374,7 +382,9 @@ msgstr "Réference :"
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
-msgid "This Entry Line will be referred for the information of the ordering customer."
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
 msgstr ""
 
 #. module: account_payment
@@ -461,8 +471,11 @@ msgstr "Information"
 
 #. module: account_payment
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: account_payment
 #: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
@@ -542,7 +555,9 @@ msgstr "Ligne d'entrée"
 
 #. module: account_payment
 #: help:payment.line,communication:0
-msgid "Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
 msgstr ""
 
 #. module: account_payment
@@ -620,4 +635,3 @@ msgstr ""
 #: field:payment.mode,journal:0
 msgid "Journal"
 msgstr "Journal"
-
diff --git a/addons/account_report/i18n/fr_FR.po b/addons/account_report/i18n/fr_FR.po
index a0fba03f1eb..db6dde5f8fa 100644
--- a/addons/account_report/i18n/fr_FR.po
+++ b/addons/account_report/i18n/fr_FR.po
@@ -1,242 +1,562 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* account_reporting
+#	* account_report
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:35+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:34+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 14:04+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: account_reporting
-#: field:color.rml,code:0
-msgid "code"
-msgstr "code"
+#. module: account_report
+#: field:account.report.history,name:0
+#: selection:account.report.report,type:0
+#: model:ir.model,name:account_report.model_account_report_history
+msgid "Indicator"
+msgstr "Indicateur"
+
+#. module: account_report
+#: wizard_field:print.indicators.pdf,init,file:0
+msgid "Select a PDF File"
+msgstr "Sélectionnez un fichier PDF"
+
+#. module: account_report
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
 
-#. module: account_reporting
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#. module: account_report
+#: view:account.report.report:0
+msgid "Operators:"
+msgstr "Opérateurs"
+
+#. module: account_report
+#: field:account.report.report,parent_id:0
+msgid "Parent"
+msgstr "Parent"
+
+#. module: account_report
+#: field:account.report.report,disp_graph:0
+msgid "Display As Graph"
 msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
 
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Helvetica-Bold"
-msgstr "Helvetica-Bold"
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Debit:"
+msgstr ""
 
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Helvetica"
-msgstr "Helvetica"
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Others"
+msgstr "Autres"
 
-#. module: account_reporting
-#: field:account.report.bs,note:0
-msgid "Note"
-msgstr "Note"
+#. module: account_report
+#: view:account.report.report:0
+msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
 
-#. module: account_reporting
-#: field:account.report.bs,report_type:0
-msgid "Report Type"
-msgstr "Type de Rapport"
-
-#. module: account_reporting
-#: model:ir.ui.menu,name:account_reporting.action_account_report_bs_form
-#: model:ir.ui.menu,name:account_reporting.menu_finan_config_BSheet
-msgid "Balance Sheet Report"
-msgstr "Rapport de bilan"
-
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Courier"
-msgstr "Courier"
-
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Courier-BoldOblique"
-msgstr "Courier-BoldOblique"
-
-#. module: account_reporting
-#: wizard_button:account.account.balancesheet.report,init,report:0
-msgid "Print BalanceSheet"
-msgstr "Impression du bilan"
-
-#. module: account_reporting
-#: help:account.account.balancesheet.report,init,periods:0
-msgid "All periods if empty"
-msgstr "Toutes les périodes si vide"
-
-#. module: account_reporting
-#: field:account.report.bs,color_font:0
-msgid "Font Color"
-msgstr "Couleur de la police"
-
-#. module: account_reporting
-#: selection:account.report.bs,report_type:0
-msgid "Report Objects With Accounts and child of Accounts"
-msgstr "Rapport des objets avec les comptes et les comptes fils"
-
-#. module: account_reporting
-#: model:ir.module.module,description:account_reporting.module_meta_information
-msgid ""
-"Financial and accounting reporting\n"
-"    Balance Sheet Report"
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Tabular Summary"
+msgstr "Résumé tabulaire"
+
+#. module: account_report
+#: code:addons/account_report/wizard/wizard_print_indicators.py:0
+#, python-format
+msgid "Please select maximum 8 records to fit the page-width."
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Notes"
+msgstr "Notes"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "= Goodness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Very bad"
+msgstr "Très mauvais"
+
+#. module: account_report
+#: field:account.report.history,val:0
+#: field:account.report.report,amount:0
+msgid "Value"
+msgstr "Valeur"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "= Badness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Bad"
+msgstr "Mauvais"
+
+#. module: account_report
+#: wizard_view:print.indicators.pdf,init:0
+msgid "Select the PDF file on which Indicators will be printed."
+msgstr ""
+"Sélectionnez le fichier PDF sur lequel les indicateurs seront imprimés."
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "> Goodness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,badness_limit:0
+msgid "Badness Indicator Limit"
 msgstr ""
-"Rapports financiers et comptables \n"
-"    Rapport de bilan"
 
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Courier-Oblique"
-msgstr "Courier-Oblique"
+#. module: account_report
+#: selection:account.report.report,status:0
+msgid "Very Bad"
+msgstr "Très mauvais"
 
-#. module: account_reporting
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
+msgid "Indicator history"
+msgstr "Historique de l'Indicateur"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "credit(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Report Amount:"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.fiscal_statements
+msgid "Fiscal Statements"
+msgstr "Extraits fiscaux"
+
+#. module: account_report
+#: wizard_button:print.indicators,init,next:0
+msgid "Next"
+msgstr "Suivant"
+
+#. module: account_report
+#: model:ir.module.module,shortdesc:account_report.module_meta_information
+msgid "Reporting for accounting"
+msgstr ""
+
+#. module: account_report
+#: wizard_button:print.indicators,next,print:0
+#: wizard_button:print.indicators.pdf,init,print:0
+msgid "Print"
+msgstr "Imprimer"
+
+#. module: account_report
+#: field:account.report.report,type:0
+msgid "Type"
+msgstr "Type"
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
+msgid "Print Indicators in PDF"
+msgstr "Imprimer les Indicateurs dans le fichier PDF"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Tax Code:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Good"
+msgstr "Bon"
+
+#. module: account_report
+#: code:addons/account_report/account.py:0
+#, python-format
+msgid "Error !"
+msgstr "Erreur !"
+
+#. module: account_report
+#: view:account.report.history:0
+msgid "Account Report History"
+msgstr ""
+
+#. module: account_report
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
-#. module: account_reporting
-#: field:account.report.bs,name:0
-#: field:color.rml,name:0
-msgid "Name"
-msgstr "Nom"
+#. module: account_report
+#: help:account.report.report,badness_limit:0
+msgid "This Value sets the limit of badness."
+msgstr ""
+
+#. module: account_report
+#: wizard_field:print.indicators,init,select_base:0
+msgid "Choose Criteria"
+msgstr "Choisissez les critères"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "debit(['ACCOUNT_CODE',],fiscalyear)"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Credit:"
+msgstr ""
+
+#. module: account_report
+#: wizard_view:print.indicators,init:0
+msgid "Select the criteria based on which Indicators will be printed."
+msgstr ""
+"Sélectionnez les critères sur lesquels seront basés les indicateurs à "
+"imprimer."
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "< Badness Indicator Limit:"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+#: selection:account.report.report,status:0
+msgid "Very Good"
+msgstr "Très bien"
+
+#. module: account_report
+#: field:account.report.report,note:0
+msgid "Note"
+msgstr "Note"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Currency:"
+msgstr "Devise"
+
+#. module: account_report
+#: field:account.report.report,status:0
+msgid "Status"
+msgstr "Status"
+
+#. module: account_report
+#: help:account.report.report,disp_tree:0
+msgid ""
+"When the indicators are printed, if one indicator is set with this field to "
+"True, then it will display one more graphs with all its children in tree"
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,status:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Example: (balance(['6','45'],-1) - credit(['7'])) / report('RPT1')"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.report,active:0
+msgid "Active"
+msgstr "Actif"
 
-#. module: account_reporting
-#: view:account.report.bs:0
+#. module: account_report
+#: field:account.report.report,disp_tree:0
+msgid "Display Tree"
+msgstr ""
+
+#. module: account_report
+#: selection:print.indicators,init,select_base:0
+msgid "Based On Fiscal Years"
+msgstr "Basé sur les Années Fiscales"
+
+#. module: account_report
+#: model:ir.model,name:account_report.model_account_report_report
 msgid "Account reporting"
 msgstr "Rapport de compte"
 
-#. module: account_reporting
-#: model:ir.ui.menu,name:account_reporting.bs_report_action_form
-msgid "Balance Sheet Report Form"
-msgstr "Formulaire du rapport de bilan"
-
-#. module: account_reporting
-#: view:account.report.bs:0
-msgid "Notes"
-msgstr "Notes"
+#. module: account_report
+#: view:account.report.report:0
+msgid "Account Balance:"
+msgstr ""
 
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Times-BoldItalic"
-msgstr "Times-BoldItalic"
-
-#. module: account_reporting
-#: model:ir.model,name:account_reporting.model_account_report_bs
-msgid "Account reporting for Balance Sheet"
-msgstr "Rapports des comptes pour le bilan"
-
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Courier-Bold"
-msgstr "Courier-Bold"
-
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Times-Italic"
-msgstr "Times-Italic"
-
-#. module: account_reporting
-#: selection:account.report.bs,report_type:0
-msgid "Report Objects Only"
-msgstr "Rapport sur les objets seulement"
-
-#. module: account_reporting
-#: model:ir.model,name:account_reporting.model_color_rml
-msgid "Rml Colors"
-msgstr "Couleurs RML"
-
-#. module: account_reporting
-#: model:ir.module.module,shortdesc:account_reporting.module_meta_information
-msgid "Reporting of Balancesheet for accounting"
-msgstr "Rapport sur bilan pour la comptabilité"
-
-#. module: account_reporting
-#: field:account.report.bs,code:0
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Expression :"
+msgstr "Expression :"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "report('REPORT_CODE')"
+msgstr "Rapport comptable"
+
+#. module: account_report
+#: field:account.report.report,expression:0
+msgid "Expression"
+msgstr "Expression"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Accounting reporting"
+msgstr "Rapport comptable"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_form
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_form
+msgid "New Reporting Item Formula"
+msgstr "Nouvelle formule"
+
+#. module: account_report
+#: field:account.report.report,code:0
+#: rml:accounting.report:0
 msgid "Code"
 msgstr "Code"
 
-#. module: account_reporting
-#: field:account.report.bs,parent_id:0
-msgid "Parent"
-msgstr "Parent"
-
-#. module: account_reporting
-#: field:account.report.bs,sequence:0
-msgid "Sequence"
-msgstr "Séquence"
+#. module: account_report
+#: field:account.report.history,tmp:0
+msgid "temp"
+msgstr ""
 
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Times-Bold"
-msgstr "Times-Bold"
+#. module: account_report
+#: field:account.report.history,period_id:0
+msgid "Period"
+msgstr "Période"
 
-#. module: account_reporting
-#: view:account.report.bs:0
+#. module: account_report
+#: view:account.report.report:0
 msgid "General"
 msgstr "Général"
 
-#. module: account_reporting
-#: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
-msgid "Fiscal year"
-msgstr "Année fiscale"
-
-#. module: account_reporting
-#: view:account.report.bs:0
-#: field:account.report.bs,account_id:0
-msgid "Accounts"
-msgstr "Comptes"
-
-#. module: account_reporting
-#: wizard_field:account.account.balancesheet.report,init,periods:0
-msgid "Periods"
-msgstr "Périodes"
-
-#. module: account_reporting
-#: field:account.report.bs,color_back:0
-msgid "Back Color"
-msgstr "Couleur de fond"
-
-#. module: account_reporting
-#: field:account.report.bs,child_id:0
-msgid "Children"
-msgstr "Fils"
+#. module: account_report
+#: view:account.report.report:0
+msgid "Legend of operators"
+msgstr "Légende des opérateurs"
 
-#. module: account_reporting
-#: wizard_button:account.account.balancesheet.report,init,end:0
+#. module: account_report
+#: wizard_button:print.indicators,init,end:0
+#: wizard_button:print.indicators,next,end:0
+#: wizard_button:print.indicators.pdf,init,end:0
 msgid "Cancel"
 msgstr "Annuler"
 
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Times-Roman"
-msgstr "Times-Roman"
-
-#. module: account_reporting
-#: selection:account.report.bs,font_style:0
-msgid "Helvetica-Oblique"
-msgstr "Helvetica-Oblique"
-
-#. module: account_reporting
-#: field:account.report.bs,font_style:0
-msgid "Font"
-msgstr "Police"
-
-#. module: account_reporting
-#: wizard_view:account.account.balancesheet.report,init:0
-msgid "Customize Report"
-msgstr "Personnaliser  le Rapport"
-
-#. module: account_reporting
-#: selection:account.report.bs,report_type:0
-msgid "Report Objects With Accounts"
-msgstr "Rapport des objets avec les comptes"
+#. module: account_report
+#: field:account.report.report,child_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: account_report
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
+
+#. module: account_report
+#: help:account.report.report,goodness_limit:0
+msgid "This Value sets the limit of goodness."
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.wizard,name:account_report.wizard_print_indicators
+#: model:ir.ui.menu,name:account_report.menu_wizard_print_indicators
+#: wizard_view:print.indicators,init:0
+#: wizard_view:print.indicators,next:0
+msgid "Print Indicators"
+msgstr "Imprimer les Indicateurs"
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "+ - * / ( )"
+msgstr "+ - * / ( )"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Printing date:"
+msgstr "Date d'impression"
+
+#. module: account_report
+#: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
+msgid "Indicators in PDF"
+msgstr "Indicateurs en PDF"
+
+#. module: account_report
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "at"
+msgstr "à"
+
+#. module: account_report
+#: rml:accounting.report:0
+msgid "Accounting Report"
+msgstr "Rapport comptable"
+
+#. module: account_report
+#: field:account.report.report,goodness_limit:0
+msgid "Goodness Indicator Limit"
+msgstr ""
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_other
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_other
+msgid "Other reports"
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid ""
+"Note: The second arguement 'fiscalyear' and 'period' are optional "
+"arguements.If the value is -1,previous fiscalyear or period is considered."
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid ")"
+msgstr ")"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_fiscal
+msgid "Fiscal Statements reporting"
+msgstr "Rapport des extraits fiscaux"
+
+#. module: account_report
+#: selection:print.indicators,init,select_base:0
+msgid "Based on Fiscal Periods"
+msgstr "Basé sur les Périodes Fiscales"
+
+#. module: account_report
+#: model:ir.actions.report.xml,name:account_report.report_print_indicators
+#: rml:print.indicators:0
+msgid "Indicators"
+msgstr "Indicateurs"
+
+#. module: account_report
+#: wizard_view:print.indicators.pdf,init:0
+msgid "Print Indicators with PDF"
+msgstr "Imprimer les Indicateurs dans le fichier PDF"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_indicator
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view_indicator
+msgid "Indicators reporting"
+msgstr "Rapport d'indicateurs"
+
+#. module: account_report
+#: field:account.report.report,name:0
+#: rml:accounting.report:0
+#: rml:print.indicators:0
+msgid "Name"
+msgstr "Nom"
+
+#. module: account_report
+#: wizard_field:print.indicators,next,base_selection:0
+msgid "Select Criteria"
+msgstr "Sélectionnez les critères"
+
+#. module: account_report
+#: code:addons/account_report/account.py:0
+#, python-format
+msgid ""
+"You cannot delete an indicator history record. You may have to delete the "
+"concerned Indicator!"
+msgstr ""
+"Vous ne pouvez pas supprimer un enregistrement de l'historique d'un "
+"indicateur. Vous devez supprimer l'Indicateur concerné."
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "tax_code(['ACCOUNT_TAX_CODE',],period)"
+msgstr ""
+
+#. module: account_report
+#: field:account.report.history,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Année Fiscale"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree
+#: model:ir.actions.act_window,name:account_report.action_account_report_tree_view
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_define
+#: model:ir.ui.menu,name:account_report.menu_action_account_report_tree_view
+msgid "Custom reporting"
+msgstr "Personnaliser un rapport"
+
+#. module: account_report
+#: code:addons/account_report/wizard/wizard_print_indicators.py:0
+#, python-format
+msgid "User Error!"
+msgstr ""
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Page"
+msgstr "Page"
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "View"
+msgstr "Vue"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "Indicators -"
+msgstr "Indicateurs -"
+
+#. module: account_report
+#: help:account.report.report,disp_graph:0
+msgid ""
+"If the field is set to True, information will be printed as a Graph, "
+"otherwise as an array."
+msgstr ""
+
+#. module: account_report
+#: view:account.report.report:0
+msgid "Return value for status"
+msgstr "Valeur de retour pour status"
+
+#. module: account_report
+#: field:account.report.report,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
+
+#. module: account_report
+#: rml:accounting.report:0
+msgid "Amount"
+msgstr "Montant"
+
+#. module: account_report
+#: rml:print.indicators:0
+msgid "1cm 27.7cm 20cm 27.7cm"
+msgstr "1cm 27.7cm 20cm 27.7cm"
+
+#. module: account_report
+#: model:ir.module.module,description:account_report.module_meta_information
+msgid ""
+"Financial and accounting reporting\n"
+"    Fiscal statements\n"
+"    Indicators\n"
+"    "
+msgstr ""
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Fiscal Statement"
+msgstr ""
diff --git a/addons/account_reporting/i18n/fr_FR.po b/addons/account_reporting/i18n/fr_FR.po
index c80cab02c02..5ed3e293258 100644
--- a/addons/account_reporting/i18n/fr_FR.po
+++ b/addons/account_reporting/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:12+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_reporting
 #: field:color.rml,code:0
@@ -22,8 +23,11 @@ msgstr "code"
 
 #. module: account_reporting
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: account_reporting
 #: selection:account.report.bs,font_style:0
@@ -88,7 +92,8 @@ msgstr ""
 
 #. module: account_reporting
 #: model:ir.module.module,description:account_reporting.module_meta_information
-msgid "Financial and accounting reporting\n"
+msgid ""
+"Financial and accounting reporting\n"
 "    Balance Sheet Report"
 msgstr ""
 
@@ -238,4 +243,3 @@ msgstr "Police"
 #: wizard_view:account.account.balancesheet.report,init:0
 msgid "Customize Report"
 msgstr "Personnaliser  le Rapport"
-
diff --git a/addons/account_tax_include/i18n/fr_FR.po b/addons/account_tax_include/i18n/fr_FR.po
index eee7d6d0aa7..640de885a7b 100644
--- a/addons/account_tax_include/i18n/fr_FR.po
+++ b/addons/account_tax_include/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 13:37+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 13:56+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
diff --git a/addons/account_voucher/account.py b/addons/account_voucher/account.py
index 58b7c7dff21..4006cde9863 100644
--- a/addons/account_voucher/account.py
+++ b/addons/account_voucher/account.py
@@ -159,44 +159,45 @@ class Account(osv.osv):
             else:
                  vals['type1'] = 'none'
         super(Account, self).write(cr, uid,ids, vals, context)
-        self_obj= self.browse(cr,uid,ids)
-        move_pool=self.pool.get('account.move')
-        if vals:
-            for obj in self_obj:
-                flg=0
-                if obj.journal_id and obj.journal_id.type == 'situation':
-                    move=move_pool.search(cr,uid,[('journal_id','=',obj.journal_id.id)])
-                    if move:
-                        move_obj=move_pool.browse(cr,uid,move[0])
-                        move=move[0]
-                    else:
-                        name = self.pool.get('ir.sequence').get_id(cr, uid, obj.journal_id.sequence_id.id)
-                        move_data = {'name': name, 'journal_id': obj.journal_id.id}
-                        move=self.pool.get('account.move').create(cr,uid,move_data)
-                        move_obj=move_pool.browse(cr,uid,move)
-                    move_line_data={'name':obj.journal_id.name,
-                                           'debit':obj.debit or 0.0,
-                                           'credit':obj.credit or 0.0,
-                                           'account_id':obj.id,
-                                           'move_id':move,
-                                           'journal_id':obj.journal_id.id,
-                                           'period_id':move_obj.period_id.id,
-                                           }
-                    if obj.type1:
-                        if obj.type1 == 'dr':
-                            move_line_data['debit'] = obj.open_bal
-                        elif obj.type1 == 'cr':
-                            move_line_data['credit'] = obj.open_bal
-                    if move_obj and move:
-                        for move_line in move_obj.line_id:
-                            if move_line.account_id.id == obj.id:
-                                if move_line_data['debit'] == 0.0 and move_line_data['credit']== 0.0:
-                                    self.pool.get('account.move.line').unlink(cr,uid,[move_line.id])
-                                else:
-                                    self.pool.get('account.move.line').write(cr,uid,[move_line.id],move_line_data)
-                                flg=1
-                        if not flg:
-                            self.pool.get('account.move.line').create(cr,uid,move_line_data)
+        if vals.has_key('open_bal'):
+            self_obj= self.browse(cr,uid,ids)
+            move_pool=self.pool.get('account.move')
+            if vals:
+                for obj in self_obj:
+                    flg=0
+                    if obj.journal_id and obj.journal_id.type == 'situation':
+                        move=move_pool.search(cr,uid,[('journal_id','=',obj.journal_id.id)])
+                        if move:
+                            move_obj=move_pool.browse(cr,uid,move[0])
+                            move=move[0]
+                        else:
+                            name = self.pool.get('ir.sequence').get_id(cr, uid, obj.journal_id.sequence_id.id)
+                            move_data = {'name': name, 'journal_id': obj.journal_id.id}
+                            move=self.pool.get('account.move').create(cr,uid,move_data)
+                            move_obj=move_pool.browse(cr,uid,move)
+                        move_line_data={'name':obj.journal_id.name,
+                                               'debit':obj.debit or 0.0,
+                                               'credit':obj.credit or 0.0,
+                                               'account_id':obj.id,
+                                               'move_id':move,
+                                               'journal_id':obj.journal_id.id,
+                                               'period_id':move_obj.period_id.id,
+                                               }
+                        if obj.type1:
+                            if obj.type1 == 'dr':
+                                move_line_data['debit'] = obj.open_bal
+                            elif obj.type1 == 'cr':
+                                move_line_data['credit'] = obj.open_bal
+                        if move_obj and move:
+                            for move_line in move_obj.line_id:
+                                if move_line.account_id.id == obj.id:
+                                    if move_line_data['debit'] == 0.0 and move_line_data['credit']== 0.0:
+                                        self.pool.get('account.move.line').unlink(cr,uid,[move_line.id])
+                                    else:
+                                        self.pool.get('account.move.line').write(cr,uid,[move_line.id],move_line_data)
+                                    flg=1
+                            if not flg:
+                                self.pool.get('account.move.line').create(cr,uid,move_line_data)
         return True
 
     def onchange_type(self, cr, uid, ids,user_type,type1):
diff --git a/addons/account_voucher/account_view.xml b/addons/account_voucher/account_view.xml
index 721fc0c2604..5201e41e468 100755
--- a/addons/account_voucher/account_view.xml
+++ b/addons/account_voucher/account_view.xml
@@ -70,13 +70,12 @@
 		</record>
 
 		<record model="ir.ui.view" id="account_form1">
-			<field name="name">account.form</field>
+			<field name="name">account.form1</field>
 			<field name="inherit_id" ref="account.view_account_form"/>
 			<field name="model">account.account</field>
 			<field name="type">form</field>
 			<field name="arch" type="xml">
 				<field name="user_type" position="after">
-<!--					<field name="diff" select="2" />-->
 					<field name="balance" string="Closing Balance" select="2"/>
 					<field name="type1" select="2" />
 					<field name="open_bal" select="2"/>
@@ -86,7 +85,7 @@
 		</record>
 		
 		<record model="ir.ui.view" id="account_form2">
-			<field name="name">account.form</field>
+			<field name="name">account.form2</field>
 			<field name="inherit_id" ref="account.view_account_form"/>
 			<field name="model">account.account</field>
 			<field name="type">form</field>
@@ -97,11 +96,11 @@
 			</field>
 		</record>
 		
-		<record model="ir.ui.view" id="account_form3">
-			<field name="name">account.form</field>
+		<record model="ir.ui.view" id="account_tree1">
+			<field name="name">account.tree1</field>
 			<field name="inherit_id" ref="account.view_account_tree"/>
 			<field name="model">account.account</field>
-			<field name="type">form</field>
+			<field name="type">tree</field>
 			<field name="arch" type="xml">
 				<field name="name" position="after">
 						<field name="open_bal" select="1"/>
@@ -109,15 +108,14 @@
 			</field>
 		</record>
 		
-		<record model="ir.ui.view" id="account_form4">
-			<field name="name">account.form</field>
+		<record model="ir.ui.view" id="account_tree2">
+			<field name="name">account.tree2</field>
 			<field name="inherit_id" ref="account.view_account_tree"/>
 			<field name="model">account.account</field>
-			<field name="type">form</field>
+			<field name="type">tree</field>
 			<field name="arch" type="xml">
-				<field name="balance" position="replace">
-						<field name="balance" />
-				<field name="type1"/>
+				<field name="company_currency_id" position="before">
+					<field name="type1"/>
 				</field>
 			</field>
 		</record>
diff --git a/addons/account_voucher/i18n/fr_FR.po b/addons/account_voucher/i18n/fr_FR.po
index 6212d6b266a..0ffb0449972 100644
--- a/addons/account_voucher/i18n/fr_FR.po
+++ b/addons/account_voucher/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:27+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:18+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.act_account_acount_move_line_open1
@@ -441,8 +442,11 @@ msgstr "Pro-forma"
 
 #. module: account_voucher
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -594,4 +598,3 @@ msgstr "Souche de Reçu Bancaire"
 #: field:account.voucher,journal_id:0
 msgid "Journal"
 msgstr "Journal"
-
diff --git a/addons/analytic_journal_billing_rate/i18n/fr_FR.po b/addons/analytic_journal_billing_rate/i18n/fr_FR.po
index 191f5c87e59..8dcb202c240 100644
--- a/addons/analytic_journal_billing_rate/i18n/fr_FR.po
+++ b/addons/analytic_journal_billing_rate/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 13:38+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 14:00+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/fr_FR.po b/addons/analytic_user_function/i18n/fr_FR.po
index f180bd1eeb2..3d88a00326d 100644
--- a/addons/analytic_user_function/i18n/fr_FR.po
+++ b/addons/analytic_user_function/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:01+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
 #: constraint:ir.ui.view:0
@@ -28,8 +29,11 @@ msgstr ""
 
 #. module: analytic_user_function
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
@@ -55,7 +59,9 @@ msgstr "Utilisateur"
 #. module: analytic_user_function
 #: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
 msgid "Relation table between users and products on a analytic account"
-msgstr "Tableau de relation entre les utilisateurs et les produits sur un compte analytique"
+msgstr ""
+"Tableau de relation entre les utilisateurs et les produits sur un compte "
+"analytique"
 
 #. module: analytic_user_function
 #: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
@@ -66,4 +72,3 @@ msgstr ""
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
 msgstr "Produit de l'Utilisateur pour ce Compte Analytique"
-
diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 176ac3039bb..4fe20c5f0bd 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -76,7 +76,7 @@ class auction_dates(osv.osv):
         'acc_income': fields.many2one('account.account', 'Income Account', required=True),
         'acc_expense': fields.many2one('account.account', 'Expense Account', required=True),
         'adj_total': fields.function(_adjudication_get, method=True, string='Total Adjudication',store=True),
-        'state': fields.selection((('draft','Draft'),('close','Closed')),'Status',select=1, readonly=True),
+        'state': fields.selection((('draft','Draft'),('closed','Closed')),'Status',select=1, readonly=True),
         'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', required=True),
 
     }
@@ -999,7 +999,7 @@ class report_seller_auction(osv.osv):
                 select
                     adl.id as auction,
                     min(al.id) as id,
-                    adl.auction1 as date,
+                    to_char(adl.auction1, 'YYYY-MM-DD') as date,
                     ad.partner_id as seller,
                     count(al.id) as "object_number",
                     SUM(al.obj_price) as "total_price",
@@ -1037,7 +1037,7 @@ class report_seller_auction2(osv.osv):
         cr.execute('''create or replace view report_seller_auction2  as
             (select
                 min(al.id) as id,
-                adl.auction1 as date,
+                to_char(adl.auction1, 'YYYY-MM-DD') as date,
                 adl.id as auction,
                 ad.partner_id as seller,
                 sum(al.obj_price) as "sum_adj",
@@ -1073,7 +1073,7 @@ class report_auction_view2(osv.osv):
         cr.execute('''create or replace view report_auction_view2 as (
             select
                 ad.id as id,
-                ad.auction1 as date,
+                to_char(ad.auction1, 'YYYY-MM-DD') as date,
                 ad.id as "auction",
                 count(al.id) as "obj_number",
                 SUM(al.obj_price) as "sum_adj",
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index aaa4c8b1e6c..bbaa12a3601 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -1215,8 +1215,7 @@ sign in sign out report by user
 		<field name="res_model">report.attendance</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,graph</field>
-		<field name="domain"> [('name','ilike',time.strftime('%Y-%m-%d'))]</field>
-		<field name="domain"> [('employee_id','=',uid)]</field>
+		<field name="domain"> [('name','=',time.strftime('%Y-%m-%d')),('employee_id','=',uid)]</field>
 		<!--<field name="domain"> [('name','ilike',time.strftime('%Y-%m'))]</field>-->
 	</record>
 	<menuitem name="Attendance" action="action_report_auction_sign_in_out_member_tree1" id="menu_report_auction_sign_in_out_member_tree1" parent="auction_report_employees_menu"/>
@@ -1226,7 +1225,7 @@ sign in sign out report by user
 		<field name="res_model">report.attendance</field>
 		<field name="view_type">form</field>
 		<field name="view_mode">tree,graph</field>
-		<field name="domain"> [('name','ilike',time.strftime('%Y-%m-%d'))]</field>
+		<field name="domain"> [('name','=',time.strftime('%Y-%m-%d'))]</field>
 	</record>
 
 	<menuitem name="Attendance"  action="action_report_auction_sign_in_out_manager_tree1" id="menu_report_auction_sign_in_out_manager_tree1" parent="auction_report_manager_menu"/>
diff --git a/addons/auction/i18n/fr_FR.po b/addons/auction/i18n/fr_FR.po
index a4b4e5a421a..4516d349ca9 100644
--- a/addons/auction/i18n/fr_FR.po
+++ b/addons/auction/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 11:59+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:21+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
 #: field:report.deposit.border,total_marge:0
@@ -286,7 +287,9 @@ msgstr "Dates"
 #. module: auction
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Erreur: l'unité de vente doit appartenir à une catégorie différente que l'unité de mesure"
+msgstr ""
+"Erreur: l'unité de vente doit appartenir à une catégorie différente que "
+"l'unité de mesure"
 
 #. module: auction
 #: rml:auction.total.rml:0
@@ -463,7 +466,8 @@ msgstr "Vendu"
 #. module: auction
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr "Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
+msgstr ""
+"Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
 
 #. module: auction
 #: field:auction.bid_line,name:0
@@ -666,7 +670,8 @@ msgstr "Erreur: code EAN invalide"
 
 #. module: auction
 #: model:ir.module.module,description:auction.module_meta_information
-msgid "This module provides functionality to \n"
+msgid ""
+"This module provides functionality to \n"
 "     manage artists, articles, sellers, buyers and auction.\n"
 "     Manage bids, track of sold, paid and unpaid objects.\n"
 "     Delivery Management. \n"
@@ -1605,8 +1610,11 @@ msgstr "Créer les factures"
 
 #. module: auction
 #: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent faire partie de la même catégorie"
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
 
 #. module: auction
 #: xsl:report.auction.vnd_bordereau:0
@@ -1745,8 +1753,11 @@ msgstr ""
 
 #. module: auction
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: auction
 #: field:auction.deposit,transfer:0
@@ -2026,7 +2037,8 @@ msgstr "Premier jour de l'exposition"
 
 #. module: auction
 #: wizard_view:auction.lots.auction_move,init:0
-msgid "Warning, this will erase the object adjudication price and its buyer !"
+msgid ""
+"Warning, this will erase the object adjudication price and its buyer !"
 msgstr "Attention, cela effacera l'adjudication de l'objet et son acheteur !"
 
 #. module: auction
@@ -2607,4 +2619,3 @@ msgstr "Historique de la vente"
 #: xsl:report.auction.lots.list.landscape:0
 msgid "Orders"
 msgstr "Commandes"
-
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index bd3eace7542..b721aad42a3 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -130,7 +130,12 @@ class audittrail_log_line(osv.osv):
 
 audittrail_log_line()
 
-def get_value_text(cr, uid, field_name,values,object, context={}):
+
+objects_proxy = netsvc.SERVICES['object'].__class__
+
+class audittrail_objects_proxy(objects_proxy):
+
+    def get_value_text(self, cr, uid, field_name, values, object, context={}):
             pool = pooler.get_pool(cr.dbname)
             obj=pool.get(object.model)
             object_name=obj._name
@@ -169,7 +174,7 @@ def get_value_text(cr, uid, field_name,values,object, context={}):
                         return value
             return values
         
-def create_log_line(cr,uid,id,object,lines=[]):
+    def create_log_line(self, cr, uid, id, object, lines=[]):
         pool = pooler.get_pool(cr.dbname)
         obj=pool.get(object.model)
         object_name=obj._name
@@ -193,7 +198,7 @@ def create_log_line(cr,uid,id,object,lines=[]):
                 cr.commit()
         return True
 
-def log_fct( db, uid, passwd, object, method, fct_src , *args ):
+    def log_fct(self, db, uid, passwd, object, method, fct_src, *args):
             logged_uids = []
             pool = pooler.get_pool(db)
             cr = pooler.get_db(db).cursor()
@@ -215,10 +220,10 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ):
                             line={
                                   'name':field,
                                   'new_value':new_value[field],
-                                  'new_value_text':get_value_text(cr,uid,field,new_value[field],model_object)
+                                  'new_value_text': self.get_value_text(cr,uid,field,new_value[field],model_object)
                                   }
                             lines.append(line)
-                    create_log_line(cr,uid,id,model_object,lines)
+                    self.create_log_line(cr,uid,id,model_object,lines)
                 cr.commit()
                 cr.close()
                 return res_id
@@ -229,7 +234,7 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ):
                     old_values=pool.get(model_object.model).read(cr,uid,res_id,args[1].keys())
                     old_values_text={}
                     for field in args[1].keys():
-                        old_values_text[field]=get_value_text(cr,uid,field,old_values[field],model_object)
+                        old_values_text[field] = self.get_value_text(cr,uid,field,old_values[field],model_object)
                     res =fct_src( db, uid, passwd, object, method, *args)
                     cr.commit()
                     if res:
@@ -243,12 +248,12 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ):
                                           'name':field,
                                           'new_value':field in new_values and new_values[field] or '',
                                           'old_value':field in old_values and old_values[field] or '',
-                                          'new_value_text':get_value_text(cr,uid,field,new_values[field],model_object),
+                                          'new_value_text': self.get_value_text(cr,uid,field,new_values[field],model_object),
                                           'old_value_text':old_values_text[field]
                                           }
                                     lines.append(line)
                             cr.commit()
-                            create_log_line(cr,uid,id,model_object,lines)
+                            self.create_log_line(cr,uid,id,model_object,lines)
                     cr.close()
                     return res
 
@@ -271,11 +276,11 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ):
                                 line={
                                           'name':field,
                                           'old_value':old_values[res_id][field],
-                                          'old_value_text':get_value_text(cr,uid,field,old_values[res_id][field],model_object)
+                                          'old_value_text': self.get_value_text(cr,uid,field,old_values[res_id][field],model_object)
                                           }
                                 lines.append(line)
                     cr.commit()
-                    create_log_line(cr,uid,id,model_object,lines)
+                    self.create_log_line(cr,uid,id,model_object,lines)
                 cr.close()
                 return res
             
@@ -294,28 +299,27 @@ def log_fct( db, uid, passwd, object, method, fct_src , *args ):
                                 line={
                                       'name':field,
                                       'old_value':old_values[res_id][field],
-                                      'old_value_text':get_value_text(cr,uid,field,old_values[res_id][field],model_object)
+                                      'old_value_text': self.get_value_text(cr,uid,field,old_values[res_id][field],model_object)
                                       }
                                 lines.append(line)
                         cr.commit()
-                        create_log_line(cr,uid,id,model_object,lines)
+                        self.create_log_line(cr,uid,id,model_object,lines)
                 res =fct_src( db, uid, passwd, object, method, *args)
                 cr.close()
                 return res
             cr.close()
 
-def tmp_fct(fct_src):
-    def execute( db, uid, passwd, object, method, *args):
+    def execute(self, db, uid, passwd, object, method, *args):
         pool = pooler.get_pool(db)
         cr = pooler.get_db(db).cursor()
         cr.autocommit(True)
         obj=pool.get(object)
         logged_uids = []
         object_name=obj._name
-        obj_ids= pool.get('ir.model').search(cr, uid,[('model','=',object_name)])
-        model_object=pool.get('ir.model').browse(cr,uid,obj_ids)[0]
+       
+        fct_src = super(audittrail_objects_proxy, self).execute
         
-        def my_fct( db, uid, passwd, object, method, *args):
+        def my_fct(db, uid, passwd, object, method, *args):
             field = method
             rule = False
             obj_ids= pool.get('ir.model').search(cr, uid,[('model','=',object_name)])
@@ -323,12 +327,12 @@ def tmp_fct(fct_src):
                 if obj_name == 'audittrail.rule':
                     rule = True
             if not rule:
-                return fct_src( db, uid, passwd, object, method, *args)
+                return fct_src(db, uid, passwd, object, method, *args)
             if not len(obj_ids):
-                return fct_src(  db, uid, passwd, object, method, *args)
+                return fct_src(db, uid, passwd, object, method, *args)
             rule_ids=pool.get('audittrail.rule').search(cr, uid, [('object_id','=',obj_ids[0]),('state','=','subscribed')])
             if not len(rule_ids):
-                return fct_src( db, uid, passwd, object, method, *args)
+                return fct_src(db, uid, passwd, object, method, *args)
 
             for thisrule in pool.get('audittrail.rule').browse(cr, uid, rule_ids):
                 for user in thisrule.user_id:
@@ -336,16 +340,13 @@ def tmp_fct(fct_src):
                 if not len(logged_uids) or uid in logged_uids:
                     if field in ('read','write','create','unlink'):
                         if getattr(thisrule, 'log_'+field):
-                            return log_fct(db, uid, passwd, object, method, fct_src , *args)
-                return fct_src(  db, uid, passwd, object, method, *args)
-        res = my_fct( db, uid, passwd, object, method, *args)
+                            return self.log_fct(db, uid, passwd, object, method, fct_src, *args)
+                return fct_src(db, uid, passwd, object, method, *args)
+        res = my_fct(db, uid, passwd, object, method, *args)
         cr.close()
         return res
-    return execute
 
-obj  = netsvc.SERVICES['object']
-obj.execute = tmp_fct(obj.execute)
-obj.exportMethod(obj.execute)
+audittrail_objects_proxy()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/audittrail/i18n/fr_FR.po b/addons/audittrail/i18n/fr_FR.po
index 7cfa5b4c1da..5179ee4d59a 100644
--- a/addons/audittrail/i18n/fr_FR.po
+++ b/addons/audittrail/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:41+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
 #: model:ir.module.module,shortdesc:audittrail.module_meta_information
@@ -22,8 +23,11 @@ msgstr ""
 
 #. module: audittrail
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: audittrail
 #: field:audittrail.log.line,log_id:0
@@ -148,8 +152,11 @@ msgstr "Nouvelle valeur texte: "
 
 #. module: audittrail
 #: model:ir.module.module,description:audittrail.module_meta_information
-msgid "Allows the administrator to track every user operations on all objects of the system.\n"
-"    Subscribe Rules for read, write, create and delete on objects and check logs"
+msgid ""
+"Allows the administrator to track every user operations on all objects of "
+"the system.\n"
+"    Subscribe Rules for read, write, create and delete on objects and check "
+"logs"
 msgstr ""
 
 #. module: audittrail
@@ -313,4 +320,3 @@ msgstr "Supprimer les journaux"
 #: field:audittrail.log,name:0
 msgid "Name"
 msgstr "Nom"
-
diff --git a/addons/base_contact/i18n/fr_FR.po b/addons/base_contact/i18n/fr_FR.po
index 725848d5f09..003fc58f28e 100644
--- a/addons/base_contact/i18n/fr_FR.po
+++ b/addons/base_contact/i18n/fr_FR.po
@@ -6,14 +6,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:21+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_contact
+#: field:res.partner.job,other:0
+msgid "Other"
+msgstr "Autre"
+
+#. module: base_contact
+#: help:res.partner.job,other:0
+msgid "Additional phone field"
+msgstr "Champ téléphone additionnel"
+
+#. module: base_contact
+#: field:res.partner.job,fax:0
+msgid "Fax"
+msgstr "Fax"
+
+#. module: base_contact
+#: field:res.partner.job,extension:0
+msgid "Extension"
+msgstr "Poste"
+
+#. module: base_contact
+#: help:res.partner.job,extension:0
+msgid "Internal/External extension phone number"
+msgstr "Extension Interne/Externe numéro de téléphone"
 
 #. module: base_contact
 #: field:res.partner.job,sequence_contact:0
@@ -27,8 +53,11 @@ msgstr "res.partner.contact"
 
 #. module: base_contact
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: base_contact
 #: field:res.partner.job,function_id:0
@@ -66,11 +95,6 @@ msgid "Contact Partner Function"
 msgstr "Fonction du contact du partenaire"
 
 #. module: base_contact
-#: field:res.partner.job,other:0
-msgid "Other"
-msgstr ""
-
-#. module: base_contact
 #: model:process.transition,name:base_contact.process_transition_contacttofunction0
 msgid "Contact to function"
 msgstr "Contact vers fonction"
@@ -91,21 +115,11 @@ msgid "# of Contacts"
 msgstr ""
 
 #. module: base_contact
-#: help:res.partner.job,other:0
-msgid "Additional phone field"
-msgstr ""
-
-#. module: base_contact
 #: model:process.node,name:base_contact.process_node_function0
 msgid "Function"
 msgstr "Fonction"
 
 #. module: base_contact
-#: field:res.partner.job,fax:0
-msgid "Fax"
-msgstr ""
-
-#. module: base_contact
 #: field:res.partner.contact,lang_id:0
 msgid "Language"
 msgstr "Langue"
@@ -137,8 +151,12 @@ msgstr ""
 
 #. module: base_contact
 #: help:res.partner.job,sequence_partner:0
-msgid "Order of importance of this job title in the list of job title of the linked partner"
-msgstr "Par ordre d'importance le titre de cet emploi dans la liste des titres d'emplois est lié au partenaire"
+msgid ""
+"Order of importance of this job title in the list of job title of the linked "
+"partner"
+msgstr ""
+"Par ordre d'importance le titre de cet emploi dans la liste des titres "
+"d'emplois est lié au partenaire"
 
 #. module: base_contact
 #: field:res.partner.contact,email:0
@@ -170,8 +188,12 @@ msgstr "Nationalité"
 
 #. module: base_contact
 #: help:res.partner.job,sequence_contact:0
-msgid "Order of importance of this address in the list of addresses of the linked contact"
-msgstr "Par ordre d'importance, cette adresse dans la liste d'adresse est lié au contact"
+msgid ""
+"Order of importance of this address in the list of addresses of the linked "
+"contact"
+msgstr ""
+"Par ordre d'importance, cette adresse dans la liste d'adresse est lié au "
+"contact"
 
 #. module: base_contact
 #: field:res.partner.address,job_id:0
@@ -210,21 +232,11 @@ msgid "Seq."
 msgstr "Séq."
 
 #. module: base_contact
-#: field:res.partner.job,extension:0
-msgid "Extension"
-msgstr ""
-
-#. module: base_contact
 #: field:res.partner.contact,mobile:0
 msgid "Mobile"
 msgstr "Portable"
 
 #. module: base_contact
-#: help:res.partner.job,extension:0
-msgid "Internal/External extension phone number"
-msgstr ""
-
-#. module: base_contact
 #: model:process.node,note:base_contact.process_node_contacts0
 msgid "People you work with."
 msgstr "Personne avec qui vous travaillez"
@@ -346,4 +358,3 @@ msgstr "Site web"
 #: field:res.partner.contact,birthdate:0
 msgid "Birth Date"
 msgstr "Date de naissance"
-
diff --git a/addons/base_iban/i18n/fr_FR.po b/addons/base_iban/i18n/fr_FR.po
index 28cd3169ae4..bfd5bc1683f 100644
--- a/addons/base_iban/i18n/fr_FR.po
+++ b/addons/base_iban/i18n/fr_FR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:05+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-06-12 13:22+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:28+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -47,6 +47,12 @@ msgid "iban"
 msgstr "IBAN"
 
 #. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+#: field:res.partner.bank,iban:0
+msgid "IBAN"
+msgstr "IBAN"
+
+#. module: base_iban
 #: model:res.partner.bank.type,name:base_iban.bank_iban
 msgid "IBAN Account"
 msgstr "No IBAN du compte"
@@ -55,9 +61,3 @@ msgstr "No IBAN du compte"
 #: model:res.partner.bank.type.field,name:base_iban.bank_acc_number_field
 msgid "acc_number"
 msgstr "acc_number"
-
-#. module: base_iban
-#: model:ir.module.module,shortdesc:base_iban.module_meta_information
-#: field:res.partner.bank,iban:0
-msgid "IBAN"
-msgstr "IBAN"
diff --git a/addons/base_module_merge/i18n/fr_FR.po b/addons/base_module_merge/i18n/fr_FR.po
index d1e20e3a889..c57c274c83f 100644
--- a/addons/base_module_merge/i18n/fr_FR.po
+++ b/addons/base_module_merge/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-04-10 12:03+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:15+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_merge
 #: wizard_field:base_module_merge.module_merge,info,category:0
@@ -132,7 +133,10 @@ msgstr ""
 
 #. module: base_module_merge
 #: wizard_view:base_module_merge.module_merge,save:0
-msgid "If you think your module could interrest others people, we'd like you to publish it on OpenERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module."
+msgid ""
+"If you think your module could interrest others people, we'd like you to "
+"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
+"the website or using features of the 'base_module_publish' module."
 msgstr ""
 
 #. module: base_module_merge
@@ -160,4 +164,3 @@ msgstr ""
 #: wizard_button:base_module_merge.module_merge,save,end:0
 msgid "Close"
 msgstr ""
-
diff --git a/addons/base_module_publish/i18n/fr_FR.po b/addons/base_module_publish/i18n/fr_FR.po
index 67b97de0646..35b6f22f6f2 100644
--- a/addons/base_module_publish/i18n/fr_FR.po
+++ b/addons/base_module_publish/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:45+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_publish
 #: wizard_field:base_module_publish.module_publish,step1,category:0
@@ -135,8 +136,11 @@ msgstr "Description"
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,step2:0
 #: wizard_view:base_module_publish.module_publish_all,login:0
-msgid "If you don't have an access, you can create one http://www.openerp.com/"
-msgstr "Si vous n'avez pas d'accès, vous pouvez en créer un sur http://www.openerp.com/"
+msgid ""
+"If you don't have an access, you can create one http://www.openerp.com/"
+msgstr ""
+"Si vous n'avez pas d'accès, vous pouvez en créer un sur "
+"http://www.openerp.com/"
 
 #. module: base_module_publish
 #: wizard_view:base_module_publish.module_publish,init:0
@@ -361,4 +365,3 @@ msgstr "Publier le module"
 #: wizard_button:base_module_publish.module_publish,step2,step1:0
 msgid "Previous"
 msgstr "Précédent"
-
diff --git a/addons/base_module_quality/pyflakes_test/pyflakes_test.py b/addons/base_module_quality/pyflakes_test/pyflakes_test.py
index 635d4364dcb..bc649f26b52 100644
--- a/addons/base_module_quality/pyflakes_test/pyflakes_test.py
+++ b/addons/base_module_quality/pyflakes_test/pyflakes_test.py
@@ -67,7 +67,7 @@ class quality_test(base_module_quality.abstract_quality_check):
                         return None
                     if not res:
                         continue
-                    self.result_details += '''<table border="2" bordercolor="black" width="100%" align="center"><tr><td width="30%"> ''' + file_py + '</td><td width="70%"><table border=2 bordercolor=black >'
+                    self.result_details += '''<table border="2" bordercolor="black" width="90%"><tr><td width="40%"> ''' + file_py + '</td><td width="60%"><table border=2 bordercolor=black width="100%">'
                     list_res = res.split('\n')
                     temp_dict = {}
                     keys = ['imported but unused statements', 'unable to detect undefined names', \
@@ -78,7 +78,10 @@ class quality_test(base_module_quality.abstract_quality_check):
                     map(lambda key:temp_dict.setdefault(key, 0), keys)
                     detail_str = ''
                     for line in list_res:
-                        self.result_details += '''<tr><td width="100%"> ''' + line + '</td></tr>'
+                        line = line.split(':')
+                        line.pop(0)
+                        line = " ".join(line)
+                        self.result_details += '''<tr><td > ''' + line + '</td></tr>'
                         detail_str += line + '\n'
                         if line.find("imported but unused") != -1:
                             temp_dict['imported but unused statements'] += 1
@@ -110,7 +113,7 @@ class quality_test(base_module_quality.abstract_quality_check):
                     dict_py[file_py] = [file_py, final_str]
                 except:
                     dict_py[file_py] = [file_py, _("Unable to parse the result. Check the details.")]
-                self.result_details += '</table></td>'
+                self.result_details += '</table></td></tr></table>'
         if not flag:
             self.error = True
             self.result = _("No python file found")
@@ -126,4 +129,4 @@ class quality_test(base_module_quality.abstract_quality_check):
             return self.format_table(header, data_list=dict_py)
         return ""
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py
index ac460dabbc0..b77027bbda2 100644
--- a/addons/base_module_record/base_module_record.py
+++ b/addons/base_module_record/base_module_record.py
@@ -25,16 +25,17 @@ from osv import fields,osv
 import netsvc
 import pooler
 import string
+import tools
 
-installed = False
+objects_proxy = netsvc.SERVICES['object'].__class__
 
-def fnct_call(fnct):
-    def execute(*args, **argv):
+class recording_objects_proxy(objects_proxy):
+    def execute(self, *args, **argv):
         if len(args) >= 6 and isinstance(args[5], dict):
             _old_args = args[5].copy()
         else:
             _old_args = None
-        res = fnct(*args, **argv)
+        res = super(recording_objects_proxy, self).execute(*args, **argv)
         pool = pooler.get_pool(args[0])
         mod = pool.get('ir.module.record')
         if mod and mod.recording:
@@ -44,39 +45,28 @@ def fnct_call(fnct):
                     if args[5]:
                         mod.recording_data.append(('query', args, argv,res))
         return res
-    return execute
 
-def fnct_call_workflow(fnct):
-    def exec_workflow(*args, **argv):
-        res = fnct(*args, **argv)
+    def exec_workflow(self, *args, **argv):
+        res = super(recording_objects_proxy, self).exec_workflow(*args, **argv)
         pool = pooler.get_pool(args[0])
         mod = pool.get('ir.module.record')
         if mod and mod.recording:
             mod.recording_data.append(('workflow', args, argv))
         return res
-    return exec_workflow
+
+recording_objects_proxy()
+
 
 class base_module_record(osv.osv):
     _name = "ir.module.record"
     _columns = {
 
     }
-    def __init__(self, pool, cr=None):
-        global installed
-        if super(base_module_record, self).__init__.func_code.co_argcount ==3:
-            super(base_module_record, self).__init__(pool,cr)
-        else:
-            super(base_module_record, self).__init__(pool)
+    def __init__(self, *args, **kwargs):
         self.recording = 0
         self.recording_data = []
         self.depends = {}
-        if not installed:
-            obj = netsvc.SERVICES['object']
-            obj.execute = fnct_call(obj.execute)
-            obj.exportMethod(obj.execute)
-            obj.exec_workflow = fnct_call_workflow(obj.exec_workflow)
-            obj.exportMethod(obj.exec_workflow)
-            installed = True
+        super(base_module_record, self).__init__(*args, **kwargs)
 
     # To Be Improved
     def _create_id(self, cr, uid, model, data):
@@ -138,8 +128,9 @@ class base_module_record(osv.osv):
                     noupdate = noupdate or update
                 if not id:
                     field.setAttribute("model", fields[key]['relation'])
-                    name = self.pool.get(fields[key]['relation']).browse(cr, uid, val).name
-                    field.setAttribute("search", "[('name','=','"+name+"')]")
+                    fld_nm = self.pool.get(fields[key]['relation'])._rec_name
+                    name = self.pool.get(fields[key]['relation']).read(cr, uid, val,[fld_nm])[fld_nm] or False
+                    field.setAttribute("search", str([(str(fld_nm) ,'=', name)]))
                 else:
                     field.setAttribute("ref", id)
                 record.appendChild(field)
@@ -185,7 +176,7 @@ class base_module_record(osv.osv):
                     val = str(val)
 
                 val = val and ('"""%s"""' % val.replace('\\', '\\\\').replace('"', '\"')) or 'False'
-                field.setAttribute(u"eval",  val.decode('utf-8'))
+                field.setAttribute(u"eval",  tools.ustr(val))
                 record.appendChild(field)
         return record_list, noupdate
 
diff --git a/addons/base_module_record/i18n/fr_FR.po b/addons/base_module_record/i18n/fr_FR.po
index a28fbac24ad..84468d0ba80 100644
--- a/addons/base_module_record/i18n/fr_FR.po
+++ b/addons/base_module_record/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:59+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,category:0
@@ -35,8 +36,11 @@ msgstr "ir.module.record"
 
 #. module: base_module_record
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,init:0
@@ -244,13 +248,27 @@ msgstr "OK"
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record_objects,save:0
 #: wizard_view:base_module_record.module_save,save:0
-msgid "If you think your module could interrest others people, we'd like you to publish it on OpenERP.com, in the 'Modules' section. You can do it through the website or using features of the 'base_module_publish' module."
-msgstr "Si vous pensez que votre module peut interresser d'autres personnes, nou aimerions que vous le publiez sur OpenERP.com dans la section 'Modules'. Vous pouvez le faire par le site internet ou en utilisant les fonctionnalités du module 'base_module_publish'."
+msgid ""
+"If you think your module could interrest others people, we'd like you to "
+"publish it on OpenERP.com, in the 'Modules' section. You can do it through "
+"the website or using features of the 'base_module_publish' module."
+msgstr ""
+"Si vous pensez que votre module peut interresser d'autres personnes, nou "
+"aimerions que vous le publiez sur OpenERP.com dans la section 'Modules'. "
+"Vous pouvez le faire par le site internet ou en utilisant les "
+"fonctionnalités du module 'base_module_publish'."
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,start:0
-msgid "The module recorder allows you to record every operation made in the Open ERP client and save them as a module. You will be able to install this module on any database to reuse and/or publish it."
-msgstr "Le module recorder vous permet d'enregistrer toutes les manipulations effectuées dans le client OpenERP et de sauvegarder le tout dans un module. Vous serez capable d'installer ce module sur toutes vos bases de données et/ou de le publier."
+msgid ""
+"The module recorder allows you to record every operation made in the Open "
+"ERP client and save them as a module. You will be able to install this "
+"module on any database to reuse and/or publish it."
+msgstr ""
+"Le module recorder vous permet d'enregistrer toutes les manipulations "
+"effectuées dans le client OpenERP et de sauvegarder le tout dans un module. "
+"Vous serez capable d'installer ce module sur toutes vos bases de données "
+"et/ou de le publier."
 
 #. module: base_module_record
 #: model:ir.actions.wizard,name:base_module_record.wizard_base_module_record
@@ -264,8 +282,12 @@ msgstr "Création de module"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
-msgid "You can continue the recording session by relauching the 'start recording' wizard."
-msgstr "Vous pouvez continuer la session d'enregistrement en relançant l'assisant \"Commencer l'enregistrement\""
+msgid ""
+"You can continue the recording session by relauching the 'start recording' "
+"wizard."
+msgstr ""
+"Vous pouvez continuer la session d'enregistrement en relançant l'assisant "
+"\"Commencer l'enregistrement\""
 
 #. module: base_module_record
 #: wizard_field:base_module_record.module_record_objects,intro,data_kind:0
@@ -287,8 +309,11 @@ msgstr "Sauvegarder le Module Enregistré"
 
 #. module: base_module_record
 #: wizard_view:base_module_record.module_record,stop:0
-msgid "Open ERP recording is stopped. Don't forget to save the recorded module."
-msgstr "L'enregistrement OpenERP est arreté. N'oublier pas de sauvegarder le module enregistré."
+msgid ""
+"Open ERP recording is stopped. Don't forget to save the recorded module."
+msgstr ""
+"L'enregistrement OpenERP est arreté. N'oublier pas de sauvegarder le module "
+"enregistré."
 
 #. module: base_module_record
 #: wizard_button:base_module_record.module_record,start,end:0
@@ -314,4 +339,3 @@ msgstr "Créer & Modifier"
 #: model:ir.ui.menu,name:base_module_record.menu_wizard_base_module_record_stop
 msgid "Stop Recording"
 msgstr "Arrêter l'enregistrement"
-
diff --git a/addons/base_report_creator/i18n/fr_FR.po b/addons/base_report_creator/i18n/fr_FR.po
index b60c5d7dc76..dd426050434 100644
--- a/addons/base_report_creator/i18n/fr_FR.po
+++ b/addons/base_report_creator/i18n/fr_FR.po
@@ -6,18 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:38+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
 #: help:base_report_creator.report.filter,expression:0
-msgid "Provide an expression for the field based on which you want to filter the records.\n"
+msgid ""
+"Provide an expression for the field based on which you want to filter the "
+"records.\n"
 " e.g. res_partner.id=3"
 msgstr ""
 
@@ -44,7 +47,9 @@ msgstr "Mode Graphe"
 #. module: base_report_creator
 #: code:addons/base_report_creator/base_report_creator.py:0
 #, python-format
-msgid "These is/are model(s) (%s) in selection which is/are not related to any other model"
+msgid ""
+"These is/are model(s) (%s) in selection which is/are not related to any "
+"other model"
 msgstr ""
 
 #. module: base_report_creator
@@ -364,8 +369,11 @@ msgstr "Annuler"
 
 #. module: base_report_creator
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: base_report_creator
 #: field:base_report_creator.report,view_type1:0
@@ -399,13 +407,13 @@ msgstr "Troisième vue"
 
 #. module: base_report_creator
 #: model:ir.module.module,description:base_report_creator.module_meta_information
-msgid "This modules allows you to create any statistic\n"
+msgid ""
+"This modules allows you to create any statistic\n"
 "report on several object. It's a SQL query builder and browser\n"
 "for and users.\n"
 "\n"
 "After installing the module, it adds a menu to define custom report in\n"
 "the \"Dashboard\" menu.\n"
-""
 msgstr ""
 
 #. module: base_report_creator
@@ -489,4 +497,3 @@ msgstr "Champs à Afficher"
 #: field:base_report_creator.report,filter_ids:0
 msgid "Filters"
 msgstr "Filtres"
-
diff --git a/addons/base_report_designer/i18n/fr_FR.po b/addons/base_report_designer/i18n/fr_FR.po
index 6bcee7b6e3d..191b916968e 100644
--- a/addons/base_report_designer/i18n/fr_FR.po
+++ b/addons/base_report_designer/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 13:40+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 14:04+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/i18n/fr_FR.po b/addons/base_setup/i18n/fr_FR.po
index abefdc4bfbd..43a7089bc42 100644
--- a/addons/base_setup/i18n/fr_FR.po
+++ b/addons/base_setup/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 13:23+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 13:44+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_vat/i18n/fr_FR.po b/addons/base_vat/i18n/fr_FR.po
index eb99094f132..52fdd42f37a 100644
--- a/addons/base_vat/i18n/fr_FR.po
+++ b/addons/base_vat/i18n/fr_FR.po
@@ -6,18 +6,20 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:49+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_vat
 #: model:ir.module.module,description:base_vat.module_meta_information
-msgid "Enable the VAT Number for the partner. Check the validity of that VAT Number."
+msgid ""
+"Enable the VAT Number for the partner. Check the validity of that VAT Number."
 msgstr ""
 
 #. module: base_vat
@@ -34,4 +36,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:base_vat.module_meta_information
 msgid "VAT"
 msgstr ""
-
diff --git a/addons/board/i18n/fr_FR.po b/addons/board/i18n/fr_FR.po
index fb0df08cf40..c7e8ee78dd6 100644
--- a/addons/board/i18n/fr_FR.po
+++ b/addons/board/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 14:32+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 15:00+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board
diff --git a/addons/board_account/i18n/fr_FR.po b/addons/board_account/i18n/fr_FR.po
index e6cfd0fba7a..ec4c6636c6f 100644
--- a/addons/board_account/i18n/fr_FR.po
+++ b/addons/board_account/i18n/fr_FR.po
@@ -4,16 +4,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:44+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_account
 #: view:board.board:0
@@ -61,7 +62,7 @@ msgstr "Creances âgés"
 #. module: board_account
 #: model:ir.module.module,shortdesc:board_account.module_meta_information
 msgid "Board for accountant"
-msgstr ""
+msgstr "Tableau de bord du comptable"
 
 #. module: board_account
 #: model:ir.actions.act_window,name:board_account.action_aged_income
@@ -76,7 +77,7 @@ msgstr "Mes indicateurs"
 #. module: board_account
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom du model invalide pour la définition de l'action."
 
 #. module: board_account
 #: model:ir.ui.menu,name:board_account.next_id_68
@@ -86,10 +87,9 @@ msgstr "Comptabilité"
 #. module: board_account
 #: view:board.board:0
 msgid "Account Board"
-msgstr ""
+msgstr "Tableau de bord de la comptabilité"
 
 #. module: board_account
 #: view:board.board:0
 msgid "Aged income"
 msgstr "Revenus âgés"
-
diff --git a/addons/board_association/i18n/fr_FR.po b/addons/board_association/i18n/fr_FR.po
index e86b1e55b24..c53859bb27e 100644
--- a/addons/board_association/i18n/fr_FR.po
+++ b/addons/board_association/i18n/fr_FR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:05+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-06-12 13:41+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:24+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_association
@@ -22,6 +22,11 @@ msgid "Associations"
 msgstr "Associations"
 
 #. module: board_association
+#: model:ir.module.module,shortdesc:board_association.module_meta_information
+msgid "Dashboard for Associations"
+msgstr "Tableau de Bord pour les Associations"
+
+#. module: board_association
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
@@ -48,6 +53,11 @@ msgid "Unpaid Invoices"
 msgstr "Factures impayées"
 
 #. module: board_association
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du modèle non valide pour la définition de l'action."
+
+#. module: board_association
 #: view:board.board:0
 msgid "Next Events"
 msgstr "Prochains événements"
@@ -56,8 +66,3 @@ msgstr "Prochains événements"
 #: view:board.board:0
 msgid "Registrations by Events"
 msgstr "Inscriptions par événement"
-
-#. module: board_association
-#: model:ir.module.module,shortdesc:board_association.module_meta_information
-msgid "Dashboard for Associations"
-msgstr "Tableau de Bord pour les Associations"
diff --git a/addons/board_auction/i18n/fr_FR.po b/addons/board_auction/i18n/fr_FR.po
index 2ac6ab2b2f9..ecb48838c7c 100644
--- a/addons/board_auction/i18n/fr_FR.po
+++ b/addons/board_auction/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:50+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_auction
 #: constraint:ir.ui.view:0
@@ -119,4 +120,3 @@ msgstr "Min/Adj/Max"
 #: view:board.board:0
 msgid "My Latest Objects"
 msgstr "Mes Derniers Objets"
-
diff --git a/addons/board_crm_configuration/i18n/fr_FR.po b/addons/board_crm_configuration/i18n/fr_FR.po
index c2c297df3bd..945cd9b5f60 100644
--- a/addons/board_crm_configuration/i18n/fr_FR.po
+++ b/addons/board_crm_configuration/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:57+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_crm_configuration
 #: model:ir.module.module,shortdesc:board_crm_configuration.module_meta_information
@@ -116,4 +117,3 @@ msgstr ""
 #: view:board.board:0
 msgid "My Leads"
 msgstr "Mes affaires"
-
diff --git a/addons/board_document/i18n/fr_FR.po b/addons/board_document/i18n/fr_FR.po
index f9bf4a29c3b..8907f1bf21e 100644
--- a/addons/board_document/i18n/fr_FR.po
+++ b/addons/board_document/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:55+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_document
 #: constraint:ir.ui.view:0
@@ -86,4 +87,3 @@ msgstr "Fichiers par Utilisateur"
 #: view:board.board:0
 msgid "Document board"
 msgstr "Tableau des Documents"
-
diff --git a/addons/board_manufacturing/i18n/fr_FR.po b/addons/board_manufacturing/i18n/fr_FR.po
index e244ace8742..4d50e0f1841 100644
--- a/addons/board_manufacturing/i18n/fr_FR.po
+++ b/addons/board_manufacturing/i18n/fr_FR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:12+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:38+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:44+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_manufacturing
@@ -33,6 +33,11 @@ msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: board_manufacturing
 #: view:board.board:0
+msgid "Deliveries (Out packing)"
+msgstr ""
+
+#. module: board_manufacturing
+#: view:board.board:0
 msgid "Manufacturing board"
 msgstr "Tableau de bord production"
 
@@ -42,9 +47,9 @@ msgid "Production"
 msgstr "Gestion de la production"
 
 #. module: board_manufacturing
-#: view:board.board:0
-msgid "Deliveries (Out packing)"
-msgstr "Livraisons"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
 
 #. module: board_manufacturing
 #: model:ir.actions.act_window,name:board_manufacturing.open_board_manufacturing
@@ -53,6 +58,11 @@ msgid "Production Dashboard"
 msgstr "Tableau de bord de production"
 
 #. module: board_manufacturing
+#: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
+msgid "Board for manufacturing"
+msgstr ""
+
+#. module: board_manufacturing
 #: view:board.board:0
 msgid "Stock value variation"
 msgstr "Variation de la valeur du stock"
@@ -61,8 +71,3 @@ msgstr "Variation de la valeur du stock"
 #: view:board.board:0
 msgid "Workcenter futur load"
 msgstr "Charge future du poste de charge"
-
-#. module: board_manufacturing
-#: model:ir.module.module,shortdesc:board_manufacturing.module_meta_information
-msgid "Board for manufacturing"
-msgstr "Tableau de Bord de la Production"
diff --git a/addons/board_project/i18n/fr_FR.po b/addons/board_project/i18n/fr_FR.po
index f104da1fa6a..3262bd86aca 100644
--- a/addons/board_project/i18n/fr_FR.po
+++ b/addons/board_project/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 11:57+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_project
 #: view:board.board:0
@@ -136,4 +137,3 @@ msgstr "Mon pipeline"
 #: view:board.board:0
 msgid "My Timesheet"
 msgstr ""
-
diff --git a/addons/board_sale/i18n/fr_FR.po b/addons/board_sale/i18n/fr_FR.po
index f8d64446cee..500fb2ea4c8 100644
--- a/addons/board_sale/i18n/fr_FR.po
+++ b/addons/board_sale/i18n/fr_FR.po
@@ -4,19 +4,24 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:08+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:44+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:36+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:12+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: board_sale
+#: model:ir.module.module,shortdesc:board_sale.module_meta_information
+msgid "Dashboard for sales"
+msgstr "Tableau de Bord des Ventes"
+
+#. module: board_sale
 #: model:ir.actions.act_window,name:board_sale.open_board_sales_manager
 #: model:ir.ui.menu,name:board_sale.menu_board_sales_manager
 msgid "Sale Dashboard"
@@ -48,6 +53,11 @@ msgid "My open quotations"
 msgstr "Mes Devis Ouverts"
 
 #. module: board_sale
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du model invalide pour la définition de l'action."
+
+#. module: board_sale
 #: model:ir.ui.menu,name:board_sale.next_id_88
 msgid "Sales"
 msgstr "Ventes"
@@ -61,8 +71,3 @@ msgstr "Statistiques des Cas"
 #: view:board.board:0
 msgid "Top ten sales of the month"
 msgstr "10 meilleures Ventes du Mois"
-
-#. module: board_sale
-#: model:ir.module.module,shortdesc:board_sale.module_meta_information
-msgid "Dashboard for sales"
-msgstr "Tableau de Bord des Ventes"
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 959420dbfc1..e42c0a4a455 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -520,6 +520,7 @@ class crm_case(osv.osv):
             'case_id': case.id,
             'case_subject': case.name,
             'case_date': case.date,
+            'case_description': case.description,
 
             'case_user': (case.user_id and case.user_id.name) or '/',
             'case_user_email': (case.user_id and case.user_id.address_id and case.user_id.address_id.email) or '/',
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 964abe153c2..3b425ba0f3c 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -172,6 +172,7 @@
                             <separator colspan="4" string="Special Keywords to Be Used in The Body"/>
                             <label align="0.0" string="%%(case_id)s = Case ID" colspan="2"/>
                             <label align="0.0" string="%%(case_subject)s = Case subject" colspan="2"/>
+                            <label align="0.0" string="%%(case_description)s = Case description" colspan="2"/>
                             <label align="0.0" string="%%(case_date)s = Creation date" colspan="2"/>
                             <label align="0.0" string="%%(email_from)s = Partner email" colspan="2"/>
                             <label align="0.0" string="%%(partner)s = Partner name" colspan="2"/>
diff --git a/addons/crm/i18n/fr_FR.po b/addons/crm/i18n/fr_FR.po
index a977c0fb6da..d4d6571ae67 100644
--- a/addons/crm/i18n/fr_FR.po
+++ b/addons/crm/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 11:28+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:09+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -82,8 +83,13 @@ msgstr "Tous les ouverts "
 
 #. module: crm
 #: help:crm.segmentation,som_interval_default:0
-msgid "Default state of mind for period preceeding the 'Max Interval' computation. This is the starting state of mind by default if the partner has no event."
-msgstr "Etat d'esprit par défaut pour la période précédent le calcul de l'intervale maximale. C'est l'état d'esprit par défaut si le partenaire n'a pas d'évenement."
+msgid ""
+"Default state of mind for period preceeding the 'Max Interval' computation. "
+"This is the starting state of mind by default if the partner has no event."
+msgstr ""
+"Etat d'esprit par défaut pour la période précédent le calcul de l'intervale "
+"maximale. C'est l'état d'esprit par défaut si le partenaire n'a pas "
+"d'évenement."
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -180,13 +186,19 @@ msgstr "<"
 
 #. module: crm
 #: help:crm.segmentation,categ_id:0
-msgid "The partner category that will be added to partners that match the segmentation criterions after computation."
-msgstr "La catégorie du partenaire qui sera ajouté aux partenaires correspondants aux critères de segmentation après calcul."
+msgid ""
+"The partner category that will be added to partners that match the "
+"segmentation criterions after computation."
+msgstr ""
+"La catégorie du partenaire qui sera ajouté aux partenaires correspondants "
+"aux critères de segmentation après calcul."
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
-msgid "You can not escalate this case.\nYou are already at the top level."
+msgid ""
+"You can not escalate this case.\n"
+"You are already at the top level."
 msgstr ""
 
 #. module: crm
@@ -275,8 +287,11 @@ msgstr "Nom de la règle"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_partner:0
-msgid "Check this if you want the rule to send a reminder by email to the partner."
-msgstr "Cocher là si vous voulez que la règle envoi un rappel pas email au partenaire."
+msgid ""
+"Check this if you want the rule to send a reminder by email to the partner."
+msgstr ""
+"Cocher là si vous voulez que la règle envoi un rappel pas email au "
+"partenaire."
 
 #. module: crm
 #: field:crm.case.rule,trg_priority_to:0
@@ -357,20 +372,27 @@ msgstr "%(case_subject)s = Sujet du cas"
 
 #. module: crm
 #: model:ir.module.module,description:crm.module_meta_information
-msgid "The generic Open ERP Customer Relationship Management\n"
+msgid ""
+"The generic Open ERP Customer Relationship Management\n"
 "system enables a group of people to intelligently and efficiently manage\n"
 "leads, opportunities, tasks, issues, requests, bugs, campaign, claims, etc.\n"
 "It manages key tasks such as communication, identification, prioritization,\n"
 "assignment, resolution and notification.\n"
 "\n"
-"Open ERP ensures that all cases are successfully tracked by users, customers and\n"
-"suppliers. It can automatically send reminders, escalate the request, trigger\n"
-"specific methods and lots of others actions based on your enterprise own rules.\n"
+"Open ERP ensures that all cases are successfully tracked by users, customers "
+"and\n"
+"suppliers. It can automatically send reminders, escalate the request, "
+"trigger\n"
+"specific methods and lots of others actions based on your enterprise own "
+"rules.\n"
 "\n"
-"The greatest thing about this system is that users don't need to do anything\n"
-"special. They can just send email to the request tracker. Open ERP will take\n"
+"The greatest thing about this system is that users don't need to do "
+"anything\n"
+"special. They can just send email to the request tracker. Open ERP will "
+"take\n"
 "care of thanking them for their message, automatically routing it to the\n"
-"appropriate staff, and making sure all future correspondence gets to the right\n"
+"appropriate staff, and making sure all future correspondence gets to the "
+"right\n"
 "place.\n"
 "\n"
 "The CRM module has a email gateway for the synchronisation interface\n"
@@ -522,8 +544,12 @@ msgstr "Tous les brouillons "
 
 #. module: crm
 #: help:crm.segmentation,som_interval_max:0
-msgid "The computation is made on all events that occured during this interval, the past X periods."
-msgstr "Le calcul est effectué sur tout les évenements qui ont eux lieu pendant cette interval, les dernières X périodes."
+msgid ""
+"The computation is made on all events that occured during this interval, the "
+"past X periods."
+msgstr ""
+"Le calcul est effectué sur tout les évenements qui ont eux lieu pendant "
+"cette interval, les dernières X périodes."
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -668,8 +694,12 @@ msgstr "Assigner au responsable"
 
 #. module: crm
 #: view:crm.case.rule:0
-msgid "The rule use a AND operator. The case must match all non empty fields so that the rule execute the action described in the 'Actions' tab."
-msgstr "La règle utilise l'opérateur AND. Le cas doit correspondre à tous les champs non vide pour que la règle exécute l'action définit dans l'onglet 'Actions'."
+msgid ""
+"The rule use a AND operator. The case must match all non empty fields so "
+"that the rule execute the action described in the 'Actions' tab."
+msgstr ""
+"La règle utilise l'opérateur AND. Le cas doit correspondre à tous les champs "
+"non vide pour que la règle exécute l'action définit dans l'onglet 'Actions'."
 
 #. module: crm
 #: field:crm.case,history_line:0
@@ -684,7 +714,7 @@ msgstr "Max ID partenaire traité"
 #. module: crm
 #: view:crm.case.rule:0
 msgid "Condition on Communication History"
-msgstr ""
+msgstr "Condition sur l'historique de communication"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -758,13 +788,17 @@ msgstr "Calendrier"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
-msgid "No E-Mail ID Found for the Responsible Partner or missing reply address in section!"
+msgid ""
+"No E-Mail ID Found for the Responsible Partner or missing reply address in "
+"section!"
 msgstr ""
 
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
-msgid "No E-Mail ID Found for your Company address or missing reply address in section!"
+msgid ""
+"No E-Mail ID Found for your Company address or missing reply address in "
+"section!"
 msgstr ""
 
 #. module: crm
@@ -795,8 +829,12 @@ msgstr "Historique"
 
 #. module: crm
 #: help:crm.case.rule,act_email_cc:0
-msgid "These people will receive a copy of the futur communication between partner and users by email"
-msgstr "Ces personnes recevrons une copie des futures communication entre partenaire et utilisateurs par email"
+msgid ""
+"These people will receive a copy of the futur communication between partner "
+"and users by email"
+msgstr ""
+"Ces personnes recevrons une copie des futures communication entre partenaire "
+"et utilisateurs par email"
 
 #. module: crm
 #: code:addons/crm/crm.py:0
@@ -892,8 +930,12 @@ msgstr "Après délai"
 
 #. module: crm
 #: help:crm.segmentation,sales_purchase_active:0
-msgid "Check if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
-msgstr "Vérifiez si vous voulez utiliser cet onglet comme faisant partie de la règle de segmentation. S'il n'est pas coché, le critère en dessous sera ignoré"
+msgid ""
+"Check if you want to use this tab as part of the segmentation rule. If not "
+"checked, the criteria beneath will be ignored"
+msgstr ""
+"Vérifiez si vous voulez utiliser cet onglet comme faisant partie de la règle "
+"de segmentation. S'il n'est pas coché, le critère en dessous sera ignoré"
 
 #. module: crm
 #: view:crm.case.rule:0
@@ -919,7 +961,8 @@ msgstr "En attente"
 
 #. module: crm
 #: wizard_view:crm.case.section.menu,init:0
-msgid "You may want to create a new parent menu to put all the created menus in."
+msgid ""
+"You may want to create a new parent menu to put all the created menus in."
 msgstr ""
 
 #. module: crm
@@ -945,8 +988,19 @@ msgstr "Statut d'exécution"
 
 #. module: crm
 #: help:crm.segmentation,som_interval:0
-msgid "A period is the average number of days between two cycle of sale or purchase for this segmentation. It's mainly used to detect if a partner has not purchased or buy for a too long time, so we suppose that his state of mind has decreased because he probably bought goods to another supplier. Use this functionality for recurring businesses."
+msgid ""
+"A period is the average number of days between two cycle of sale or purchase "
+"for this segmentation. It's mainly used to detect if a partner has not "
+"purchased or buy for a too long time, so we suppose that his state of mind "
+"has decreased because he probably bought goods to another supplier. Use this "
+"functionality for recurring businesses."
 msgstr ""
+"Une période est le nombre moyen de jours entre 2 cycles de vente ou d'achat "
+"pour cette segmentation. C'est couramment utilisé pour détecter si le "
+"partenaire n'a pas acheter ou vendu depuis longtemps, mais nous supposons "
+"que cet état d'esprit est dégréssif parce qu'il a probablement acheter a de "
+"meilleurs fournisseurs. Utiliser cette fonctionnalité pour des affaires "
+"récurrentes"
 
 #. module: crm
 #: selection:crm.case,priority:0
@@ -969,7 +1023,8 @@ msgstr "Escalader"
 #: code:addons/crm/crm.py:0
 #, python-format
 msgid "You must put a Partner eMail to use this action!"
-msgstr "Vous devriez indiquer un mail partenaire pour utiliser cette action !"
+msgstr ""
+"Vous devriez indiquer un mail partenaire pour utiliser cette action !"
 
 #. module: crm
 #: model:ir.module.module,shortdesc:crm.module_meta_information
@@ -1017,8 +1072,12 @@ msgstr "Tous les non assignés "
 
 #. module: crm
 #: help:crm.case.rule,act_remind_attach:0
-msgid "Check this if you want that all documents attached to the case be attached to the reminder email sent."
-msgstr "Cocher ça si vous voulez que tous les documents attachés à ce cas soit attachés à l'email de rappel."
+msgid ""
+"Check this if you want that all documents attached to the case be attached "
+"to the reminder email sent."
+msgstr ""
+"Cocher ça si vous voulez que tous les documents attachés à ce cas soit "
+"attachés à l'email de rappel."
 
 #. module: crm
 #: selection:crm.segmentation.line,operator:0
@@ -1054,7 +1113,8 @@ msgstr "Sélection exclusive"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
-msgid "Can not send mail with empty body,you should have description in the body"
+msgid ""
+"Can not send mail with empty body,you should have description in the body"
 msgstr ""
 
 #. module: crm
@@ -1138,8 +1198,11 @@ msgstr "Lignes de segmentation"
 #. module: crm
 #: code:addons/crm/crm.py:0
 #, python-format
-msgid "You must define a responsible user for this case in order to use this action!"
+msgid ""
+"You must define a responsible user for this case in order to use this action!"
 msgstr ""
+"Pour pouvoir utiliser cette action, vous devez définir un utilisateur "
+"responsable de ce cas !"
 
 #. module: crm
 #: view:crm.case:0
@@ -1255,8 +1318,11 @@ msgstr ""
 
 #. module: crm
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: crm
 #: view:res.partner.events:0
@@ -1325,7 +1391,7 @@ msgstr "ouvrir"
 #. module: crm
 #: field:crm.case.rule,trg_max_history:0
 msgid "Maximum Communication History"
-msgstr ""
+msgstr "Limite Maximale de l'Historique de communication"
 
 #. module: crm
 #: wizard_field:crm.case.section.menu,design_menu,menu11:0
@@ -1345,8 +1411,11 @@ msgstr "Corps du mail"
 
 #. module: crm
 #: help:crm.case.rule,act_remind_user:0
-msgid "Check this if you want the rule to send a reminder by email to the user."
-msgstr "Cocher ça si vous voulez que la règle envoi un rappel par email à l'utilisateur"
+msgid ""
+"Check this if you want the rule to send a reminder by email to the user."
+msgstr ""
+"Cocher ça si vous voulez que la règle envoi un rappel par email à "
+"l'utilisateur"
 
 #. module: crm
 #: field:crm.case,probability:0
@@ -1365,7 +1434,7 @@ msgstr "Segmentations"
 #. module: crm
 #: field:crm.segmentation.line,operator:0
 msgid "Mandatory / Optional"
-msgstr ""
+msgstr "Obligatoire / Optionnelle"
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_name:0
@@ -1374,7 +1443,9 @@ msgstr "Montant de vente"
 
 #. module: crm
 #: help:crm.case.section,reply_to:0
-msgid "The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this section"
+msgid ""
+"The email address put in the 'Reply-To' of all emails sent by Open ERP about "
+"cases in this section"
 msgstr ""
 
 #. module: crm
@@ -1419,8 +1490,12 @@ msgstr "Nom du segment"
 
 #. module: crm
 #: help:crm.segmentation,som_interval_decrease:0
-msgid "If the partner has not purchased (or buied) during a period, decrease the state of mind by this factor. It's a multiplication"
-msgstr "Si le partenaire n'a pas acheté pendant une période, diminue l'état d'esprit par ce facteur. C'est une multiplication"
+msgid ""
+"If the partner has not purchased (or buied) during a period, decrease the "
+"state of mind by this factor. It's a multiplication"
+msgstr ""
+"Si le partenaire n'a pas acheté pendant une période, diminue l'état d'esprit "
+"par ce facteur. C'est une multiplication"
 
 #. module: crm
 #: wizard_field:crm.case.section.menu,design_menu,menu8:0
@@ -1503,8 +1578,14 @@ msgstr "ID du cas"
 
 #. module: crm
 #: help:crm.segmentation,exclusif:0
-msgid "Check if the category is limited to partners that match the segmentation criterions. If checked, remove the category from partners that doesn't match segmentation criterions"
-msgstr "Vérifie si la catégorie est limitée au partenaires correspondants aux critères de segmentation. Si vérifié, retire la catégorie des partenaires ne correspondants pas aux critères de segmentation."
+msgid ""
+"Check if the category is limited to partners that match the segmentation "
+"criterions. If checked, remove the category from partners that doesn't match "
+"segmentation criterions"
+msgstr ""
+"Vérifie si la catégorie est limitée au partenaires correspondants aux "
+"critères de segmentation. Si vérifié, retire la catégorie des partenaires ne "
+"correspondants pas aux critères de segmentation."
 
 #. module: crm
 #: field:crm.case,log_ids:0
@@ -1596,4 +1677,3 @@ msgstr "Mettre à jour les Menus Proposés pour qu'ils soient créés"
 #: field:crm.case.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Date de déclenchement"
-
diff --git a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
index 0380770caee..11462169b06 100644
--- a/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
+++ b/addons/crm/scripts/openerp-mailgate/openerp-mailgate.py
@@ -109,7 +109,14 @@ class email_parser(object):
             import netsvc
             netsvc.Logger().notifyChannel('mailgate', netsvc.LOG_ERROR, "%s" % e)
 
-        id = self.rpc('crm.case', 'create', data)
+        try:
+            id = self.rpc('crm.case', 'create', data)
+        
+
+        except Exception,e:
+            if getattr(e,'faultCode','') and 'AccessError' in e.faultCode:
+                e = '\n\nThe Specified user does not have an access to the CRM case.'
+            print e
         attachments = message['attachment']
 
         for attach in attachments or []:
@@ -316,7 +323,11 @@ if __name__ == '__main__':
 
     msg_txt = email.message_from_file(sys.stdin)
 
-    parser.parse(msg_txt)
-
+    try :
+        parser.parse(msg_txt)
+    except Exception,e:
+        if getattr(e,'faultCode','') and 'Connection unexpectedly closed' in e.faultCode:
+            print e
+ 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_configuration/i18n/fr_FR.po b/addons/crm_configuration/i18n/fr_FR.po
index c9761422dd9..530634ac76b 100644
--- a/addons/crm_configuration/i18n/fr_FR.po
+++ b/addons/crm_configuration/i18n/fr_FR.po
@@ -6,20 +6,61 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:45+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:18+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_configuration
+#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_categ_categ2
+msgid "Cases by Opportunities, Category and Type"
+msgstr "Cas par opportunités, catégorie et type"
+
+#. module: crm_configuration
+#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_categ_stage
+msgid "Cases by Opportunities, Category and Stage"
+msgstr "Cas par opportunités, catégorie et étape"
+
+#. module: crm_configuration
+#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_categ
+msgid "Cases by Leads and Type"
+msgstr "Cas par affaires et type"
+
+#. module: crm_configuration
+#: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_tree
+#: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_tree_month
+#: view:report.crm.case.section.categ2:0
+msgid "Cases by Section and Type"
+msgstr "Cas par section et type"
+
+#. module: crm_configuration
+#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_categ
+msgid "Cases by Opportunities and Type"
+msgstr "Cas par opportunités et type"
+
+#. module: crm_configuration
+#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_categ_categ2
+#: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_categ2_tree
+#: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_categ2_tree_month
+#: view:report.crm.case.section.categ.categ2:0
+msgid "Cases by Section, Category and Type"
+msgstr "Cas par section, catégorie et type"
+
+#. module: crm_configuration
+#: field:crm.case.stage,sequence:0
+msgid "Sequence"
+msgstr "Séquence"
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all1
 msgid "Bugs Waiting Approval"
-msgstr "Bugs en attente d'approbation"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -39,13 +80,13 @@ msgstr "Cloture une affaire"
 #. module: crm_configuration
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr "Nom du modèle invalide dans la définition de l'action."
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_all3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_all3
 msgid "Current Requests"
-msgstr "Requêtes en cours"
+msgstr ""
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,helpdesk:0
@@ -58,11 +99,6 @@ msgid "Stage Name"
 msgstr "Nom de l'étape"
 
 #. module: crm_configuration
-#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_categ_categ2
-msgid "Cases by Opportunities, Category and Type"
-msgstr "Cas par opportunités, catégories et types"
-
-#. module: crm_configuration
 #: view:crm.case:0
 msgid "Claim Description"
 msgstr "Description de la réclamations"
@@ -77,19 +113,19 @@ msgstr "Montant"
 #: model:crm.case.stage,name:crm_configuration.stage_claim2
 #: model:crm.case.stage,name:crm_configuration.stage_meet1
 msgid "Fixed"
-msgstr "Corrigé"
+msgstr ""
 
 #. module: crm_configuration
 #: code:addons/crm_configuration/wizard/wizard_opportunity_set.py:0
 #: code:addons/crm_configuration/wizard/wizard_partner_create.py:0
 #, python-format
 msgid "Warning !"
-msgstr "Attention !"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_oppor5
 msgid "Campaign"
-msgstr "Campagne"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_stage_tree
@@ -125,12 +161,12 @@ msgstr "Salaire proposé"
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_fund
 msgid "New Fund Opportunity"
-msgstr "Nouvelle opportunité de fonds"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_meet3
 msgid "Phone Call"
-msgstr "Appel téléphonique"
+msgstr ""
 
 #. module: crm_configuration
 #: field:report.crm.case.section.categ.categ2,state:0
@@ -148,7 +184,7 @@ msgstr "Version"
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,opportunity:0
 msgid "Tracks identified business opportunities for your sales pipeline."
-msgstr "Suivi des opportunités commerciales et du flux des ventes."
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -158,19 +194,19 @@ msgstr "Appréciation"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_job3
 msgid "Second Interview"
-msgstr "Seconde interview"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my_new3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my_new3
 msgid "New Job Request"
-msgstr "Nouvelle demande d'emploi"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all2
 msgid "Open Bugs"
-msgstr "Bugs ouverts"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -205,12 +241,12 @@ msgstr "Rendez-vous d'opportunité"
 #. module: crm_configuration
 #: model:ir.module.module,shortdesc:crm_configuration.module_meta_information
 msgid "Customer Relationship Management"
-msgstr "Gestion de la relation client"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_claim1
 msgid "Accepted as Claim"
-msgstr "Accepté comme plainte"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_phone_incoming2
@@ -218,40 +254,40 @@ msgstr "Accepté comme plainte"
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_phone_incoming2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_phone_outgoing2
 msgid "Planned Calls"
-msgstr "Appels planifiés"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act_all0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk_all0
 msgid "All Open Helpdesk Requests"
-msgstr "Toutes les demandes ouvertes"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_lead6
 msgid "Dead"
-msgstr "Mort"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ3
 msgid "Feature Requests"
-msgstr "Demandes de fonctionalités"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor_my2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor_my2
 msgid "My Pending Opportunities"
-msgstr "Mes opportunités en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_meet2
 msgid "Home"
-msgstr "Maison"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_phone_incoming1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_phone_incoming1
 msgid "New Incoming Call"
-msgstr "Nouvel appel entrant"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -273,7 +309,7 @@ msgstr "Cas par section catégorie et étape"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs3
 msgid "My Current Jobs Requests"
-msgstr "Mes demandes d'emplois en cours"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -288,12 +324,12 @@ msgstr "Infos sur l'action"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category1
 msgid "Version 4.2"
-msgstr "Version 4.2"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category2
 msgid "Version 4.4"
-msgstr "Version 4.4"
+msgstr ""
 
 #. module: crm_configuration
 #: model:process.transition,note:crm_configuration.process_transition_opportunitymeeting0
@@ -323,34 +359,34 @@ msgstr "Escalader"
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_meet
 msgid "All Meetings"
-msgstr "Tous les rendez-vous"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.section,name:crm_configuration.section_support_help
 msgid "HelpDesk"
-msgstr "Helpdesk"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_phone_outgoing4
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_phone_outgoing4
 msgid "Calls Not Held"
-msgstr "Appels non décrochés"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage6
 msgid "Works For Me"
-msgstr "Fonctionne pour moi"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_job7
 msgid "Refused by Company"
-msgstr "Réfusé par la société"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor_all2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor_all2
 msgid "All Unassigned Opportunities"
-msgstr "Toutes les opportunités à assigner"
+msgstr ""
 
 #. module: crm_configuration
 #: model:process.transition,name:crm_configuration.process_transition_leadopportunity0
@@ -361,27 +397,31 @@ msgstr "Opportunité d'affaire"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act111
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_all
 msgid "All Helpdesk Requests"
-msgstr "Toutes les demandes helpdesk"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_oppor3
 msgid "Value Proposition"
-msgstr "Devis"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_oppor2
 msgid "New Business"
-msgstr "Nouvelle affaire"
+msgstr ""
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,phonecall:0
-msgid "Help you to encode the result of a phone call or to planify a list of phone calls to process."
-msgstr "Aide à encoder le résultat d'une conversation téléphonique ou à plannifier une liste"
+msgid ""
+"Help you to encode the result of a phone call or to planify a list of phone "
+"calls to process."
+msgstr ""
+"Aide à encoder le résultat d'une conversation téléphonique ou à plannifier "
+"une liste"
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_claim3
 msgid "Policy Claims"
-msgstr "Plainte"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -391,24 +431,24 @@ msgstr "Assigné à"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_job4
 msgid "Contract Proposed"
-msgstr "Contrat proposé"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_job_req_main
 msgid "Jobs - Hiring Process"
-msgstr "Emplois - Processus de recrutement"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_alljobs
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_alljobs
 msgid "Calendar Of Interviews"
-msgstr "Calendrier des interviews"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_my2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my2
 msgid "My Bugs With Patches"
-msgstr "Mes bugs ayant un patch"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -418,7 +458,7 @@ msgstr "Formulaire de Rendez-vous"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_oppor5
 msgid "Negotiation/Review"
-msgstr "Négociation/Amélioration"
+msgstr ""
 
 #. module: crm_configuration
 #: field:crm.menu.config_wizard,opportunity:0
@@ -428,12 +468,12 @@ msgstr "Opportunités d'affaire"
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_claim
 msgid "New Claim"
-msgstr "Nouvelle plainte"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_stage
 msgid "Cases by Opportunities and Stage"
-msgstr "Cas par opportunités et étape"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -444,29 +484,29 @@ msgstr "Date de la réclamation"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all
 msgid "All Leads"
-msgstr "Tous les prospects"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all3
 msgid "Bugs With Patches Waiting Approval"
-msgstr "Bugs avec des patch en attente d'approbation"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_job5
 msgid "Contract Signed"
-msgstr "Contrat signé"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_claim_all2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_claim_all2
 msgid "All Unclosed Claims"
-msgstr "Toutes les plaintes ouvertes"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_phone_create_partner
 msgid "Schedule Phone Call"
-msgstr "Planifier un appel"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -485,7 +525,7 @@ msgstr "Opportunité"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_lead7
 msgid "Television"
-msgstr "Télévision"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -495,12 +535,12 @@ msgstr "Envoi le partenaire et ajoute à l'historique"
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_help_support_main
 msgid "Helpdesk and Support"
-msgstr "Helpdesk et support"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_lead6
 msgid "Radio"
-msgstr "Radio"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -511,12 +551,12 @@ msgstr "Information du prospet"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my4
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my4
 msgid "My Pending Leads"
-msgstr "Mes prospects en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ2
 msgid "Patches"
-msgstr "Corrections"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -544,12 +584,12 @@ msgstr "Description de l'action"
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_user
 msgid "Cases by Leads and User"
-msgstr "Cas par prospects et utilisateurs"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_user
 msgid "Cases by Opportunities and User"
-msgstr "Cas par opportunités et utilisateurs"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.menu.config_wizard:0
@@ -565,13 +605,13 @@ msgstr "Créer un partenaire"
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor
 msgid "New Opportunity"
-msgstr "Nouvelle opportunité"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_fund_my1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_fund_my1
 msgid "My Funds"
-msgstr "Mes demandes de fonds"
+msgstr ""
 
 #. module: crm_configuration
 #: field:crm.case,partner_mobile:0
@@ -581,23 +621,23 @@ msgstr "Portable"
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_job2
 msgid "Junior Developer"
-msgstr "Développeur Junior"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_meet_my
 msgid "My Meetings"
-msgstr "Mes rendez-vous"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_claim2
 msgid "Preventive"
-msgstr "Préventif"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my3
 msgid "My Open Leads"
-msgstr "Mes prospects en cours"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -609,7 +649,7 @@ msgstr "Rendez-vous"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all4
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all4
 msgid "All Pending Leads"
-msgstr "Tous les prospects en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -627,14 +667,9 @@ msgid "Next"
 msgstr "Suivant"
 
 #. module: crm_configuration
-#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_categ_stage
-msgid "Cases by Opportunities, Category and Stage"
-msgstr "Cas par opportunités, catégories et étapes"
-
-#. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_lead4
 msgid "Print"
-msgstr "Imprimer"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -667,7 +702,7 @@ msgstr "Détails de l'affaire"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor22
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor22
 msgid "My Opportunities"
-msgstr "Mes opportunités"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.model,name:crm_configuration.model_report_crm_case_section_categ_categ2
@@ -678,7 +713,7 @@ msgstr "Cas par section, catégorie et catégorie2"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f3
 msgid "Open Feature Requests"
-msgstr "Demandes de fonctionalités en cours"
+msgstr ""
 
 #. module: crm_configuration
 #: field:crm.case,stage_id:0
@@ -703,14 +738,14 @@ msgstr "Relation avec le cas"
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_fund2
 msgid "Learning And Education"
-msgstr "Eductation"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case.stage:0
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_stage_act
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_stage_act
 msgid "Stages"
-msgstr "Etapes"
+msgstr ""
 
 #. module: crm_configuration
 #: wizard_field:crm.case.opportunity_set,init,planned_revenue:0
@@ -730,18 +765,18 @@ msgstr "Convertir en partenaire"
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_meetall3
 msgid "Next Meetings"
-msgstr "Prochains rendez-vous"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all1
 msgid "Current Leads"
-msgstr "Prospects en cours"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_claim2
 msgid "Value Claims"
-msgstr "Plainte sur valeur"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act_allhelpdesk
@@ -749,13 +784,13 @@ msgstr "Plainte sur valeur"
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk_allhelpdesk
 msgid "Calendar of Helpdesk"
-msgstr "Calendrier des helpdesk"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_fund_my2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_fund_my2
 msgid "My Funds Waiting Validation"
-msgstr "Mes fonds en attente d'approbation"
+msgstr ""
 
 #. module: crm_configuration
 #: view:report.crm.case.section.categ2:0
@@ -776,7 +811,7 @@ msgstr "Nom de l'Employé"
 #: model:crm.case.categ,name:crm_configuration.categ_lead6
 #: model:crm.case.categ,name:crm_configuration.categ_oppor6
 msgid "Website"
-msgstr "Site Internet"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all6
@@ -784,7 +819,7 @@ msgstr "Site Internet"
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all6
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f5
 msgid "Planned For Future Release"
-msgstr "Planifié pour une version future"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -797,7 +832,7 @@ msgstr "Fonds"
 #: model:crm.case.stage,name:crm_configuration.stage_claim5
 #: model:crm.case.stage,name:crm_configuration.stage_meet4
 msgid "Awaiting Response"
-msgstr "Réponse en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -818,7 +853,7 @@ msgstr "Ouvrir une opportunité d'affaire à partir du marché"
 #: model:crm.case.categ,name:crm_configuration.categ_lead2
 #: model:crm.case.categ,name:crm_configuration.categ_oppor2
 msgid "Self Generated"
-msgstr "Auto-généré"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -829,7 +864,7 @@ msgstr "Bugs"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_lead4
 msgid "Converted"
-msgstr "Converti"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -840,7 +875,7 @@ msgstr "Historique"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_act_new
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_act_new
 msgid "New Bug"
-msgstr "Nouveau bug"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -855,7 +890,7 @@ msgstr "Arbre des Emplois - Recrutements"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_lead1
 msgid "Telesales"
-msgstr "Télé-marketing"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -875,7 +910,7 @@ msgstr "Annuler"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_phone_outgoing1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_phone_outgoing1
 msgid "New Outgoing Call"
-msgstr "Nouvel appel sortant"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -886,17 +921,19 @@ msgstr "Coût de la réclamation"
 #: model:crm.case.categ,name:crm_configuration.categ_lead8
 #: model:crm.case.categ,name:crm_configuration.categ_oppor8
 msgid "Other"
-msgstr "Autre"
+msgstr ""
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on softwares"
-msgstr "Utilisé par les sociétés pour suivre des anomalies et des demandes de supports sur les logiciels"
+msgstr ""
+"Utilisé par les sociétés pour suivre des anomalies et des demandes de "
+"supports sur les logiciels"
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_lead2
 msgid "Mail"
-msgstr "Email"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.action_view_config_crm_menu
@@ -906,17 +943,17 @@ msgstr "Configure des menus pour des sections de cas"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_oppor2
 msgid "Needs Analysis"
-msgstr "Besoin d'analyse"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_my_helpdesk
 msgid "My Unclosed Requests"
-msgstr "Mes demandes non clôturées"
+msgstr ""
 
 #. module: crm_configuration
 #: model:process.process,name:crm_configuration.process_process_contractprocess0
 msgid "Contract Process"
-msgstr "Processus Contrat"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -933,7 +970,7 @@ msgstr "Etape de vente"
 #: model:crm.case.stage,name:crm_configuration.stage3
 #: model:crm.case.stage,name:crm_configuration.stage_claim3
 msgid "Won't fix"
-msgstr "Ne sera pas corrigé"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -943,13 +980,13 @@ msgstr "Prochain Rendez-vous"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_oppor7
 msgid "Closed Lost"
-msgstr "Clotûré et perdu"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_claim_my2_open
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_claim_my2_open
 msgid "My Open Claims"
-msgstr "Mes plaintes ouvertes"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.section,name:crm_configuration.section_support
@@ -972,7 +1009,7 @@ msgstr "Convertir un prospect en client"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_fund_all2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_fund_all2
 msgid "All Funds Waiting Validation"
-msgstr "Toutes les demandes en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -982,12 +1019,12 @@ msgstr "Arbre des Bugs"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_oppor4
 msgid "Proposal/Price Quote"
-msgstr "Devis"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_lead5
 msgid "Web"
-msgstr "Internet"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1007,7 +1044,7 @@ msgstr "Ressources humaines"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_job1
 msgid "Graduate"
-msgstr "Gradué"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.menu.config_wizard:0
@@ -1016,8 +1053,12 @@ msgstr "Configurer les sections de la CRM"
 
 #. module: crm_configuration
 #: wizard_view:crm.case.meeting,init:0
-msgid "Note that you can also use the calendar view to graphically schedule your next meeting."
-msgstr "Notez que vous pouvez également utiliser la vue calendrier pour planifier vos prochains rendez-vous"
+msgid ""
+"Note that you can also use the calendar view to graphically schedule your "
+"next meeting."
+msgstr ""
+"Notez que vous pouvez également utiliser la vue calendrier pour planifier "
+"vos prochains rendez-vous"
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1029,23 +1070,27 @@ msgstr "Arbre des affaires"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_phone_incoming0
 msgid "Inbound"
-msgstr "Entrant"
+msgstr ""
 
 #. module: crm_configuration
 #: constraint:crm.case.section:0
 msgid "Error ! You cannot create recursive sections."
-msgstr "Erreur ! Vous ne pouvez pas créer des sections récursives."
+msgstr ""
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,document_ics:0
-msgid " Will allow you to synchronise your Open ERP calendars with your phone, outlook, Sunbird, ical, ..."
-msgstr " Permet de synchroniser votre calendrier Open ERP avec votre téléphone, Outlook, Sunbird, iCal, ..."
+msgid ""
+" Will allow you to synchronise your Open ERP calendars with your phone, "
+"outlook, Sunbird, ical, ..."
+msgstr ""
+" Permet de synchroniser votre calendrier Open ERP avec votre téléphone, "
+"Outlook, Sunbird, iCal, ..."
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f7
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f7
 msgid "Old Feature Requests"
-msgstr "Anciennes demandes de fonctionalités"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1056,7 +1101,7 @@ msgstr "Données du contrat"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act_my2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk2
 msgid "My helpdesk Propositions to Review"
-msgstr "Mes propositions à revoir"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1066,7 +1111,7 @@ msgstr "Notes"
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_claim1
 msgid "Factual Claims"
-msgstr "Plainte Contrêtes"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1095,13 +1140,13 @@ msgstr "Revenu Estim."
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_job1
 msgid "Initial Jobs Demand"
-msgstr "Demande d'emploi initiale"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_my0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my0
 msgid "My Bugs"
-msgstr "Mes bugs"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1139,7 +1184,7 @@ msgstr "Infos"
 #: model:crm.case.section,name:crm_configuration.section_support4
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr "Levée de fonds"
+msgstr ""
 
 #. module: crm_configuration
 #: wizard_view:crm.case.partner_create,init:0
@@ -1186,29 +1231,29 @@ msgstr "Erreur !"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs1
 msgid "My Pending Jobs Requests"
-msgstr "Mes demandes d'emploi en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_job3
 msgid " > Bac +5"
-msgstr " > Bac +5"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_claim_my2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_claim_my2
 msgid "My Unclosed Claims"
-msgstr "Mes plaintes non clôturées"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_oppor1
 msgid "Prospecting"
-msgstr "Prospection"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_my1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my1
 msgid "My Open Bugs"
-msgstr "Mes bugs ouverts"
+msgstr ""
 
 #. module: crm_configuration
 #: field:crm.case,partner_name2:0
@@ -1219,12 +1264,12 @@ msgstr "Email de l'Employé"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_help_act
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_my_act
 msgid "My Helpdesk"
-msgstr "Mon helpdesk"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.categ2_fund1
 msgid "Cash"
-msgstr "Liquide"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1233,8 +1278,14 @@ msgstr "Orientation"
 
 #. module: crm_configuration
 #: view:crm.menu.config_wizard:0
-msgid "The CRM module of OpenERP is able to manage any kind of relationship. But, as to help you to start quickly on the system, we configured a few of them for you."
-msgstr "Le module CRM d'Open ERP permet de gérer tout type de relation. Mais, afin de vous aider à démarrer rapidement sur le système, nous en avons configuré quelques-unes pour vous."
+msgid ""
+"The CRM module of OpenERP is able to manage any kind of relationship. But, "
+"as to help you to start quickly on the system, we configured a few of them "
+"for you."
+msgstr ""
+"Le module CRM d'Open ERP permet de gérer tout type de relation. Mais, afin "
+"de vous aider à démarrer rapidement sur le système, nous en avons configuré "
+"quelques-unes pour vous."
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1270,13 +1321,13 @@ msgstr "Formulaire Emplois - Recrutement"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_claim1
 msgid "Corrective"
-msgstr "Corrective"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_meetings
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_meetings_new
 msgid "New Meeting"
-msgstr "Nouveau rendez-vous"
+msgstr ""
 
 #. module: crm_configuration
 #: field:report.crm.case.section.categ.categ2,name:0
@@ -1299,7 +1350,7 @@ msgstr "Affaires"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.categ2_fund3
 msgid "Credit Card"
-msgstr "Carte de crédit"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1308,14 +1359,17 @@ msgstr "Résolution: "
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,fund:0
-msgid "This may help associations in their fund raising process and tracking."
-msgstr "Ceci peut aider les associations dans leur procédure de collecte de fonds et de suivi"
+msgid ""
+"This may help associations in their fund raising process and tracking."
+msgstr ""
+"Ceci peut aider les associations dans leur procédure de collecte de fonds et "
+"de suivi"
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_f0
 msgid "All Feature Request"
-msgstr "Toutes les demandes de fonctionalités"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1347,22 +1401,24 @@ msgstr "Fermé"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all4
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all4
 msgid "Bugs Not Fixed"
-msgstr "Bugs non corrigés"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_meet2
 msgid "Internal Meeting"
-msgstr "Réunion interne"
+msgstr ""
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,lead:0
-msgid "Allows you to track and manage leads which are pre-sales requests or contacts, the very first contact with a customer request."
-msgstr "Permet de suivre et gérer les premiers contacts avec un prospect, en amont de la relation client.."
+msgid ""
+"Allows you to track and manage leads which are pre-sales requests or "
+"contacts, the very first contact with a customer request."
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_meet1
 msgid "Customer Meeting"
-msgstr "Rendez-vous client"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1387,7 +1443,7 @@ msgstr "Envoyer au prospect et ajouter à l'historique"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all3
 msgid "All Open Leads"
-msgstr "Tous les prospects en cours"
+msgstr ""
 
 #. module: crm_configuration
 #: field:crm.case,partner_phone:0
@@ -1397,7 +1453,7 @@ msgstr "Téléphone"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.categ2_fund2
 msgid "Cheque"
-msgstr "Chèque"
+msgstr ""
 
 #. module: crm_configuration
 #: code:addons/crm_configuration/wizard/meeting_planify.py:0
@@ -1414,7 +1470,7 @@ msgstr "Lorsqu'un réel projet/une réelle opportunité est détecté"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act_all3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk_all3
 msgid "All Unclosed Requests"
-msgstr "Toutes les demandes non clôturées"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1434,7 +1490,7 @@ msgstr "Catégorie2 du cas"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_act0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_act0
 msgid "All Bugs"
-msgstr "Tous les bugs"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.model,name:crm_configuration.model_report_crm_case_section_stage
@@ -1454,12 +1510,12 @@ msgstr "Général"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_lead2
 msgid "Assigned"
-msgstr "Assigné"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_lead5
 msgid "Recycled"
-msgstr "Recyclé"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1475,7 +1531,7 @@ msgstr "Communication"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor11
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor11
 msgid "All Opportunities"
-msgstr "Toutes les opportunités"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1490,12 +1546,15 @@ msgstr "Ouvert"
 #: code:addons/crm_configuration/wizard/wizard_partner_create.py:0
 #, python-format
 msgid "A partner is already existing with the same name."
-msgstr "Un partenaire existe déjà pour ce même nom."
+msgstr ""
 
 #. module: crm_configuration
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: crm_configuration
 #: field:crm.menu.config_wizard,helpdesk:0
@@ -1511,14 +1570,14 @@ msgstr "Responsable"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my1
 msgid "My Current Leads"
-msgstr "Mes prospects en cours"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage4
 #: model:crm.case.stage,name:crm_configuration.stage_claim4
 #: model:crm.case.stage,name:crm_configuration.stage_meet3
 msgid "Invalid"
-msgstr "Invalide"
+msgstr ""
 
 #. module: crm_configuration
 #: wizard_button:crm.case.meeting,init,order:0
@@ -1534,7 +1593,7 @@ msgstr "Calendrier des Rendez-vous"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor2
 msgid "My Open Opportunities"
-msgstr "Mes opportunités ouvertes"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1545,7 +1604,7 @@ msgstr "Cas par Étape et Estimations"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my_new
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_leads_my_new
 msgid "New Lead"
-msgstr "Nouvelle opportunité"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1555,17 +1614,18 @@ msgstr "Rendez-vous pour affaires"
 #. module: crm_configuration
 #: wizard_view:crm.case.partner_create,init:0
 msgid "Are you sure you want to create a partner based on this lead ?"
-msgstr "Êtes vous sure de vouloir créer un partenaire sur la base de cette affaire"
+msgstr ""
+"Êtes vous sure de vouloir créer un partenaire sur la base de cette affaire"
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_job6
 msgid "Refused by Employee"
-msgstr "Réfusé par l'employé"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_job2
 msgid "First Interview"
-msgstr "Première intervew"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1581,24 +1641,24 @@ msgstr "Arbre des Opportunités"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act_my1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk1
 msgid "My Pending helpdesk Requests"
-msgstr "Mes demandes helpdesk en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_lead1
 #: model:crm.case.categ,name:crm_configuration.categ_oppor1
 msgid "Existing Customer"
-msgstr "Client existant"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.categ2_fund4
 msgid "Demand Draft"
-msgstr "Demande brouillon"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act11
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act11
 msgid "My Jobs Requests"
-msgstr "Mes demandes d'emplois"
+msgstr ""
 
 #. module: crm_configuration
 #: wizard_field:crm.case.opportunity_set,init,name:0
@@ -1619,7 +1679,7 @@ msgstr "Durée"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_f1
 msgid "New Feature Request"
-msgstr "Nouvelle demande de fonctioanlité"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.model,name:crm_configuration.model_report_crm_case_section_categ_stage
@@ -1640,13 +1700,13 @@ msgstr "Procédure de recrutement"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_all2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_all2
 msgid "All Jobs Propositions to Review"
-msgstr "Toutes les demandes d'emploi à revoir"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_help_new_act
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_help_new_act
 msgid "New Helpdesk"
-msgstr "Nouvelle demande helpdesk"
+msgstr ""
 
 #. module: crm_configuration
 #: code:addons/crm_configuration/wizard/wizard_partner_create.py:0
@@ -1660,27 +1720,22 @@ msgid "Deadlines"
 msgstr "Dates Limites"
 
 #. module: crm_configuration
-#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_categ
-msgid "Cases by Leads and Type"
-msgstr "Cas par prospects et type"
-
-#. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_my3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_my3
 msgid "My Bugs Not Fixed"
-msgstr "Mes bugs non corrigés"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_claim_my1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_claim_my1
 msgid "My Claims"
-msgstr "Mes plaintes"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_fund_all3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_fund_all3
 msgid "All Funds To Be Processed"
-msgstr "Toutes les demandes de fonds à traiter"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1690,31 +1745,24 @@ msgstr "Recherche de fonds"
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_lead3
 msgid "In Process"
-msgstr "En cours"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_unassigned
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_unassigned
 msgid "Unassigned Leads"
-msgstr "Prospects non assignés"
-
-#. module: crm_configuration
-#: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_tree
-#: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_tree_month
-#: view:report.crm.case.section.categ2:0
-msgid "Cases by Section and Type"
-msgstr "Cas par section et type"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_aftersale
 msgid "After-Sale Services"
-msgstr "Service après-vente"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act111
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act111
 msgid "All Jobs Requests"
-msgstr "Toutes les demandes d'emploi"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1725,7 +1773,7 @@ msgstr "Job postulé"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_all2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_all2
 msgid "All Draft Leads"
-msgstr "Tous les prospects brouillon"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1741,24 +1789,19 @@ msgstr "Formulaire de Rapport de Bug"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs2
 msgid "My Jobs Propositions to Review"
-msgstr "Mes demandes d'emploi à revoir"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_leads_my
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_leads_my
 msgid "My Leads"
-msgstr "Mes prospects"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_oppor1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_oppor1
 msgid "All Open Opportunities"
-msgstr "Toutes les opportunités ouvertes"
-
-#. module: crm_configuration
-#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_oppor_categ
-msgid "Cases by Opportunities and Type"
-msgstr "Cas par opportunité et type"
+msgstr ""
 
 #. module: crm_configuration
 #: field:report.crm.case.section.categ.categ2,section_id:0
@@ -1772,23 +1815,23 @@ msgstr "Section"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act_all2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk_all2
 msgid "All Helpdesk Propositions"
-msgstr "Toutes les propositions helpdesk"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_fund1
 msgid "Social Rehabilitation And Rural Upliftment"
-msgstr "Réhabilitation sociale"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_lead3
 #: model:crm.case.categ,name:crm_configuration.categ_oppor3
 msgid "Employee"
-msgstr "Employé"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_lead1
 msgid "New"
-msgstr "Nouveau"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_lead3
@@ -1803,7 +1846,7 @@ msgstr "Prospection par couriel"
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_stage
 msgid "Cases by Leads and Stage"
-msgstr "Cas par prospect et étape"
+msgstr ""
 
 #. module: crm_configuration
 #: field:crm.menu.config_wizard,fund:0
@@ -1833,13 +1876,13 @@ msgstr "Tout premier contact avec un nouveau prospect"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_fund_my3
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_fund_my3
 msgid "My Funds To Be Processed"
-msgstr "Mes demandes de fonds à traiter"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_lead7
 #: model:crm.case.categ,name:crm_configuration.categ_oppor7
 msgid "Word of mouth"
-msgstr "Bouche à oreille"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1848,18 +1891,22 @@ msgstr "Sujet du marché"
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,claims:0
-msgid "Manages the supplier and customers claims, including your corrective or preventive actions."
-msgstr "Gérér les réclamations fournisseurs et clients, incluant vos actions correctives ou préventives."
+msgid ""
+"Manages the supplier and customers claims, including your corrective or "
+"preventive actions."
+msgstr ""
+"Gérér les réclamations fournisseurs et clients, incluant vos actions "
+"correctives ou préventives."
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_phone1
 msgid "Planned"
-msgstr "Planifié"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_meet3
 msgid "Customer Office"
-msgstr "Bureau client"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1885,7 +1932,7 @@ msgstr "Entretien avec les candidats"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_myjobs
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_myjobs
 msgid "Calendar Of My Interviews"
-msgstr "Calendrier de mes interviews"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1908,34 +1955,34 @@ msgstr "Annulé"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_oppor1
 msgid "Existing Business"
-msgstr "Client Existant"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_fund_all1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_fund_all1
 msgid "All Funds"
-msgstr "Toutes les demandes de fonds"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_category_act_meetings
 msgid "Calendar"
-msgstr "Calendrier"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_job1
 msgid "Salesman"
-msgstr "Commercial"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_oppor6
 msgid "Closed Won"
-msgstr "Clôturé et gagné"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_all0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_all0
 msgid "All Open Jobs Requests"
-msgstr "Toutes les demandes d'emplois ouvertes"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1946,19 +1993,21 @@ msgstr "Plannifier un rendez-vous"
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_fund4
 msgid "Arts And Culture"
-msgstr "Arts et cultures"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_phone2
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_phone_outgoing0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_phone_outgoing0
 msgid "Outbound"
-msgstr "Sortant"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.todo,note:crm_configuration.config_wizard_step_case_section_menu
 msgid "This Configuration step use to create Menu for Case Sections"
-msgstr "Cette étape de configuration est utilisé pour créer un menu pour une section de cas"
+msgstr ""
+"Cette étape de configuration est utilisé pour créer un menu pour une section "
+"de cas"
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -1985,7 +2034,7 @@ msgstr "Rendez-vous"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f2
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f2
 msgid "Feature Requests Waiting Approval"
-msgstr "Demandes de fonctionalités en attente d'approbation"
+msgstr ""
 
 #. module: crm_configuration
 #: wizard_view:crm.case.partner_create,init:0
@@ -2011,35 +2060,27 @@ msgid "User"
 msgstr "Utilisateur"
 
 #. module: crm_configuration
-#: model:ir.ui.menu,name:crm_configuration.menu_action_report_crm_case_lead_categ_categ2
-#: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_categ2_tree
-#: model:ir.ui.menu,name:crm_configuration.menu_crm_case_section_categ_categ2_tree_month
-#: view:report.crm.case.section.categ.categ2:0
-msgid "Cases by Section, Category and Type"
-msgstr "Cas par section, catégorie et type"
-
-#. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_job2
 msgid "Licenced"
-msgstr "Licencié"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act_all1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk_all1
 msgid "All Pending Helpdesk Requests"
-msgstr "Toutes les demandes helpdesk en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_my0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs0
 msgid "My Open Jobs Requests"
-msgstr "Mes demandes d'emlois ouvertes"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all5
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all5
 msgid "Pending Bugs"
-msgstr "Bugs en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,meeting:0
@@ -2050,23 +2091,23 @@ msgstr "Gèrer le calendrier des rendez-vous des utilisateurs"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_helpdesk_act_my0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_helpdesk_act_myhelpdesk0
 msgid "My Open Helpdesk Requests"
-msgstr "Mes demandes helpdesk ouvertes"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.categ,name:crm_configuration.categ_fund3
 msgid "Healthcare"
-msgstr "Santé"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage1
 msgid "Accepted as Bug"
-msgstr "Accepté comme bug"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_f4
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f4
 msgid "Pending Feature Requests"
-msgstr "Demande de fonctionalités en attente"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -2076,7 +2117,7 @@ msgstr "Résolution"
 #. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_meet1
 msgid "Office"
-msgstr "Bureau"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.model,name:crm_configuration.model_crm_case_stage
@@ -2092,7 +2133,7 @@ msgstr "Estimer"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ0_act_all1
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_myjobs_all1
 msgid "All Pending Jobs Requests"
-msgstr "Toutes les demandes d'emplois"
+msgstr ""
 
 #. module: crm_configuration
 #: wizard_field:crm.case.meeting,init,date:0
@@ -2105,17 +2146,21 @@ msgstr "Date de rendez vous"
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all7
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_f6
 msgid "Waiting For Reporter Response"
-msgstr "En attente d'une réponse"
+msgstr ""
 
 #. module: crm_configuration
 #: model:crm.case.stage,name:crm_configuration.stage_meet2
 msgid "Not fixed"
-msgstr "Non corrigé"
+msgstr ""
 
 #. module: crm_configuration
 #: help:crm.menu.config_wizard,jobs:0
-msgid "Help you to organise the jobs hiring process: evaluation, meetings, email integration..."
-msgstr "Aide à organiser le processus d'embauche: évaluation, rendez vous, gestion des emails"
+msgid ""
+"Help you to organise the jobs hiring process: evaluation, meetings, email "
+"integration..."
+msgstr ""
+"Aide à organiser le processus d'embauche: évaluation, rendez vous, gestion "
+"des emails"
 
 #. module: crm_configuration
 #: selection:report.crm.case.section.categ.categ2,state:0
@@ -2129,7 +2174,7 @@ msgstr "Brouillon"
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_claim0
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ_claim0
 msgid "All Claims"
-msgstr "Toutes les plaintes"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -2144,7 +2189,7 @@ msgstr "Notes Internes"
 #. module: crm_configuration
 #: model:crm.case.section,name:crm_configuration.section_support0
 msgid "Jobs"
-msgstr "Emplois"
+msgstr ""
 
 #. module: crm_configuration
 #: wizard_view:crm.case.meeting,init:0
@@ -2154,7 +2199,7 @@ msgstr "Rendez vous planifié"
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_categ_meet_create_partner
 msgid "Schedule a Meeting"
-msgstr "Planifier un rendez-vous"
+msgstr ""
 
 #. module: crm_configuration
 #: view:crm.case:0
@@ -2170,13 +2215,13 @@ msgstr "Fonds par Catégorie"
 #: model:crm.case.stage,name:crm_configuration.stage7
 #: model:crm.case.stage,name:crm_configuration.stage_meet5
 msgid "Future"
-msgstr "Futur"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.actions.act_window,name:crm_configuration.crm_case_category_act_all8
 #: model:ir.ui.menu,name:crm_configuration.menu_crm_case_categ0_act_all8
 msgid "Old Bugs"
-msgstr "Anciens bugs"
+msgstr ""
 
 #. module: crm_configuration
 #: model:ir.model,name:crm_configuration.model_crm_menu_config_wizard
@@ -2184,12 +2229,6 @@ msgid "crm.menu.config_wizard"
 msgstr "crm.menu.config_wizard"
 
 #. module: crm_configuration
-#: field:crm.case.stage,sequence:0
-msgid "Sequence"
-msgstr "Séquence"
-
-#. module: crm_configuration
 #: model:crm.case.category2,name:crm_configuration.category_lead8
 msgid "Newsletter"
-msgstr "Newsletter"
-
+msgstr ""
diff --git a/addons/crm_profiling/i18n/fr_FR.po b/addons/crm_profiling/i18n/fr_FR.po
index b46d7fb3876..5eb0611e20b 100644
--- a/addons/crm_profiling/i18n/fr_FR.po
+++ b/addons/crm_profiling/i18n/fr_FR.po
@@ -6,19 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:55+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:25+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_profiling
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
@@ -129,7 +133,9 @@ msgstr ""
 
 #. module: crm_profiling
 #: help:crm.segmentation,profiling_active:0
-msgid "Check this box if you want to use this tab as part of the segmentation rule. If not checked, the criteria beneath will be ignored"
+msgid ""
+"Check this box if you want to use this tab as part of the segmentation rule. "
+"If not checked, the criteria beneath will be ignored"
 msgstr ""
 
 #. module: crm_profiling
@@ -165,4 +171,3 @@ msgstr "Utiliser un Questionnaire"
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
 msgstr "Sauvegarder les Données"
-
diff --git a/addons/crm_vertical/i18n/fr_FR.po b/addons/crm_vertical/i18n/fr_FR.po
index a7d73fb1d45..c0269c34328 100644
--- a/addons/crm_vertical/i18n/fr_FR.po
+++ b/addons/crm_vertical/i18n/fr_FR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:00+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-06-12 13:43+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:04+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_vertical
@@ -25,4 +25,4 @@ msgstr "Erreur !"
 #. module: crm_vertical
 #: model:ir.module.module,description:crm_vertical.module_meta_information
 msgid "Simplification of the interface for CRM."
-msgstr "Simplification de l'interface de la CRM"
+msgstr ""
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 21136184789..543b194b938 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -164,6 +164,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('invoice_state','=','2binvoiced'),('state','=','done'),('type','=','out')]</field>
+            <field name="context">{'contact_display': 'partner'}</field>
         </record>
         <menuitem action="action_picking_tree4" id="menu_action_picking_tree3" parent="stock.menu_action_picking_tree"/>
 
diff --git a/addons/delivery/i18n/fr_FR.po b/addons/delivery/i18n/fr_FR.po
index 77a207ed43c..91acdadcae2 100644
--- a/addons/delivery/i18n/fr_FR.po
+++ b/addons/delivery/i18n/fr_FR.po
@@ -6,19 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:48+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:07+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -38,7 +42,7 @@ msgstr "Destination"
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
 msgid "Delivery by Poste"
-msgstr "Livraison par Poste"
+msgstr ""
 
 #. module: delivery
 #: constraint:ir.ui.view:0
@@ -48,7 +52,7 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: delivery
 #: constraint:res.partner:0
 msgid "Error ! You can not create recursive associated members."
-msgstr "Erreur ! Vous ne pouvez pas créer de membres associés de manière récursive."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,state_ids:0
@@ -63,7 +67,7 @@ msgstr ""
 #. module: delivery
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from packing."
-msgstr "Cette méthode de livraison sera utilisée lors de facturations à partir du Colisage."
+msgstr ""
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -84,7 +88,7 @@ msgstr "Fixe"
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
 #, python-format
 msgid "The order state have to be draft to add delivery lines."
-msgstr "La Commande doit être à l'état Brouillon pour ajouter des lignes de livraison."
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,line_ids:0
@@ -113,7 +117,7 @@ msgstr "Variable"
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr "Aucune grille trouvée pour ce transporteur !"
+msgstr ""
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
@@ -138,7 +142,7 @@ msgstr "Grille"
 #. module: delivery
 #: view:res.partner:0
 msgid "Deliveries Properties"
-msgstr "Propriétés des Livraisons"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.carrier,active:0
@@ -165,7 +169,7 @@ msgstr "="
 #. module: delivery
 #: field:delivery.carrier,product_id:0
 msgid "Delivery Product"
-msgstr "Produit de Livraison"
+msgstr ""
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -190,7 +194,9 @@ msgstr "Nom"
 #. module: delivery
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Erreur: l'unité de vente doit appartenir à une catégorie différente que l'unité de mesure"
+msgstr ""
+"Erreur: l'unité de vente doit appartenir à une catégorie différente que "
+"l'unité de mesure"
 
 #. module: delivery
 #: field:delivery.grid,country_ids:0
@@ -199,8 +205,11 @@ msgstr "Pays"
 
 #. module: delivery
 #: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent faire partie de la même catégorie"
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
 
 #. module: delivery
 #: view:sale.order:0
@@ -216,7 +225,7 @@ msgstr "facteur variable"
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
 #, python-format
 msgid "No grid avaible !"
-msgstr "Aucune grille disponible !"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -246,7 +255,7 @@ msgstr "Valeur maximum"
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,delivery:0
 msgid "Add Delivery Costs"
-msgstr "Ajouter des Coûts de Livraison"
+msgstr ""
 
 #. module: delivery
 #: wizard_field:delivery.sale.order,init,carrier_id:0
@@ -259,7 +268,7 @@ msgstr "Méthode de livraison"
 #. module: delivery
 #: field:sale.order,id:0
 msgid "ID"
-msgstr "ID"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -269,13 +278,13 @@ msgstr "Opérateur"
 #. module: delivery
 #: model:ir.module.module,shortdesc:delivery.module_meta_information
 msgid "Carriers and deliveries"
-msgstr "Transporteurs et Livraisons"
+msgstr ""
 
 #. module: delivery
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
 #, python-format
 msgid "Order not in draft state !"
-msgstr "Commande pas dans l'état Brouillon !"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.carrier,grids_id:0
@@ -301,11 +310,11 @@ msgstr "Partenaire pour la Livraison"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
-msgid "Allows you to add delivery methods in sales orders and packing. You can define your own carrier and delivery grids for prices. When creating invoices from picking, Open ERP is able to add and compute the shipping line."
+msgid ""
+"Allows you to add delivery methods in sales orders and packing. You can "
+"define your own carrier and delivery grids for prices. When creating "
+"invoices from picking, Open ERP is able to add and compute the shipping line."
 msgstr ""
-"Permet d'ajouter des méthodes de livraison ax commandes de ventes et colisages. "
-"Vous pouvez définir vos propres transporteurs et grilles de livraisons. "
-"À la création de factures à partir des colisages, Open ERP est capable d'ajouter et de calculer les lignes de livraison."
 
 #. module: delivery
 #: field:delivery.grid,zip_to:0
@@ -316,29 +325,30 @@ msgstr "Code postal destination"
 #: code:addons/delivery/delivery.py:0
 #, python-format
 msgid "No line matched this order in the choosed delivery grids !"
-msgstr "Aucune ligne ne correspond à cette commande dans les grilles de livraison choisies !"
+msgstr ""
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 #: model:ir.ui.menu,name:delivery.menu_action_picking_tree3
 msgid "Packing to be invoiced"
-msgstr "Colisage à facturer"
+msgstr ""
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:0
 #, python-format
 msgid "No price available !"
-msgstr "Aucun prix disponible !"
+msgstr ""
 
 #. module: delivery
 #: help:sale.order,carrier_id:0
-msgid "Complete this field if you plan to invoice the shipping based on packing."
-msgstr "Complétez ce champ si vous avez l'intention de livrer en vous basant sur le colisage."
+msgid ""
+"Complete this field if you plan to invoice the shipping based on packing."
+msgstr ""
 
 #. module: delivery
 #: model:ir.actions.wizard,name:delivery.wizard_deliver_line_add
 msgid "Delivery Costs"
-msgstr "Coûts de Livraison"
+msgstr ""
 
 #. module: delivery
 #: field:delivery.grid.line,list_price:0
@@ -359,7 +369,7 @@ msgstr "Grilles de transport"
 #: code:addons/delivery/stock.py:0
 #, python-format
 msgid "The carrier %s (id: %d) has no delivery grid!"
-msgstr "Le Transporteur %s (id: %d) n'a pas de grille de livraison !"
+msgstr ""
 
 #. module: delivery
 #: wizard_button:delivery.sale.order,init,end:0
@@ -370,7 +380,7 @@ msgstr "Annuler"
 #: code:addons/delivery/stock.py:0
 #, python-format
 msgid "Warning"
-msgstr "Avertissement"
+msgstr ""
 
 #. module: delivery
 #: field:sale.order,carrier_id:0
@@ -393,4 +403,3 @@ msgstr "Le numéro de TVA ne semble pas correct."
 #: field:delivery.grid.line,price_type:0
 msgid "Price Type"
 msgstr "Type de prix"
-
diff --git a/addons/document/document.py b/addons/document/document.py
index 585031e1fc5..1a66145a9d8 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -66,8 +66,10 @@ def random_name():
 #   root: if we are at the first directory of a ressource
 #
 INVALID_CHARS={'*':str(hash('*')), '|':str(hash('|')) , "\\":str(hash("\\")), '/':'__', ':':str(hash(':')), '"':str(hash('"')), '<':str(hash('<')) , '>':str(hash('>')) , '?':str(hash('?'))}
+
+
 class node_class(object):
-    def __init__(self, cr, uid, path,object,object2=False, context={}, content=False, type='collection', root=False):
+    def __init__(self, cr, uid, path, object, object2=False, context={}, content=False, type='collection', root=False):
         self.cr = cr
         self.uid = uid
         self.path = path
@@ -92,7 +94,7 @@ class node_class(object):
             where.append( ('parent_id','=',self.object.id) )
             where.append( ('res_id','=',False) )
         if nodename:
-            where.append( (fobj._rec_name,'like',nodename) )
+            where.append( (fobj._rec_name,'=',nodename) )
         for content in self.object.content_ids:
             if self.object2 or not content.include_name:
                 if content.include_name:
@@ -135,7 +137,7 @@ class node_class(object):
         where = []
         if nodename:    
             nodename = self.get_translation(nodename, self.context['lang'])            
-            where.append(('name','like',nodename))
+            where.append(('name','=',nodename))
         if (self.object and self.object.type=='directory') or not self.object2:
             where.append(('parent_id','=',self.object and self.object.id or False))
         else:
@@ -161,7 +163,7 @@ class node_class(object):
             fobj = pool.get('ir.attachment')
             vargs = [('parent_id','=',False),('res_id','=',False)]
             if nodename:
-                vargs.append(('name','like',nodename))
+                vargs.append(('name','=',nodename))
             file_ids=fobj.search(self.cr,self.uid,vargs)
 
             res = fobj.browse(self.cr, self.uid, file_ids, context=self.context)
@@ -171,9 +173,9 @@ class node_class(object):
             pool = pooler.get_pool(self.cr.dbname)            
             obj = pool.get(self.object.ressource_type_id.model)
             if len(obj.fields_get(self.cr, self.uid, ['dirname'])):
-                 _dirname_field = 'dirname'
+                _dirname_field = 'dirname'
             else:
-                 _dirname_field = 'name'
+                _dirname_field = 'name'
 
             name_for = obj._name.split('.')[-1]
             if nodename  and nodename.find(name_for) == 0  :
@@ -186,7 +188,7 @@ class node_class(object):
                     if nodename.find(INVALID_CHARS[invalid]) :
                         nodename=nodename.replace(INVALID_CHARS[invalid],invalid)
                 nodename = self.get_translation(nodename, self.context['lang'])
-                where.append((_dirname_field,'like',nodename))
+                where.append((_dirname_field,'=',nodename))
 
             if self.object.ressource_tree:
                 if obj._parent_name in obj.fields_get(self.cr,self.uid):                    
@@ -205,14 +207,16 @@ class node_class(object):
             
             ids = obj.search(self.cr, self.uid, where)
             res = obj.browse(self.cr, self.uid, ids,self.context)
-            for r in res:                
+            for r in res:                               
                 if len(obj.fields_get(self.cr, self.uid, [_dirname_field])):
                     r.name = eval('r.'+_dirname_field)
                 else:
-                    r.name = name_for+'%d'%r.id               
+                    r.name = False
+                if not r.name:
+                    r.name = name_for + '%d'%r.id               
                 for invalid in INVALID_CHARS:
                     if r.name.find(invalid) :
-                        r.name=r.name.replace(invalid,INVALID_CHARS[invalid])            
+                        r.name = r.name.replace(invalid,INVALID_CHARS[invalid])            
             result2 = map(lambda x: node_class(self.cr, self.uid, self.path+'/'+x.name.replace('/','__'), self.object, x, context=self.context, root=x.id), res)
             if result2:
                 if self.object.ressource_tree:
@@ -323,7 +327,7 @@ class document_directory(osv.osv):
         where = []
         if nodename:
             nodename = self.get_translation(nodename, self.context['lang'])
-            where.append(('name','like',nodename))
+            where.append(('name','=',nodename))
         if object:
             where.append(('parent_id','=',object.id))
         ids = self.search(cr, uid, where, context)
@@ -718,9 +722,45 @@ class document_configuration_wizard(osv.osv_memory):
         'host': fields.char('Server Address', size=64, help="Put here the server address or IP. " \
             "Keep localhost if you don't know what to write.", required=True)
     }
+
+    def detect_ip_addr(self, cr, uid, context=None):
+        def _detect_ip_addr(self, cr, uid, context=None):
+            from array import array
+            import socket
+            from struct import pack, unpack
+
+            try:
+                import fcntl
+            except ImportError:
+                fcntl = None
+
+            if not fcntl: # not UNIX:
+                host = socket.gethostname()
+                ip_addr = socket.gethostbyname(host)
+            else: # UNIX:
+                # get all interfaces:
+                nbytes = 128 * 32
+                s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+                names = array('B', '\0' * nbytes)
+                outbytes = unpack('iL', fcntl.ioctl( s.fileno(), 0x8912, pack('iL', nbytes, names.buffer_info()[0])))[0]
+                namestr = names.tostring()
+                ifaces = [namestr[i:i+32].split('\0', 1)[0] for i in range(0, outbytes, 32)]
+
+                for ifname in [iface for iface in ifaces if iface != 'lo']:
+                    ip_addr = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, pack('256s', ifname[:15]))[20:24])
+                    break
+            return ip_addr
+
+        try:
+            ip_addr = _detect_ip_addr(self, cr, uid, context)
+        except:
+            ip_addr = 'localhost'
+        return ip_addr
+
     _defaults = {
-        'host': lambda *args: 'localhost'
+        'host': detect_ip_addr,
     }
+
     def action_cancel(self,cr,uid,ids,conect=None):
         return {
                 'view_type': 'form',
diff --git a/addons/document/ftpserver/abstracted_fs.py b/addons/document/ftpserver/abstracted_fs.py
index b3dec8f2b5e..a59d61e8dd1 100644
--- a/addons/document/ftpserver/abstracted_fs.py
+++ b/addons/document/ftpserver/abstracted_fs.py
@@ -13,6 +13,7 @@ import netsvc
 import os
 from service import security
 from osv import osv
+import stat
 
 def log(message):
     logger = netsvc.Logger()
@@ -126,17 +127,20 @@ class abstracted_fs:
         for db_name in result:
             db, cr = None, None
             try:
-                db = pooler.get_db_only(db_name)
-                cr = db.cursor()
-                cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'")
-                if not cr.fetchone():
-                    continue
-
-                cr.execute("select id from ir_module_module where name like 'document%' and state='installed' ")
-                res = cr.fetchone()
-                if res and len(res):
-                    self.db_name_list.append(db_name)
-                cr.commit()            
+                try:
+                    db = pooler.get_db_only(db_name)
+                    cr = db.cursor()
+                    cr.execute("SELECT 1 FROM pg_class WHERE relkind = 'r' AND relname = 'ir_module_module'")
+                    if not cr.fetchone():
+                        continue
+    
+                    cr.execute("select id from ir_module_module where name like 'document%' and state='installed' ")
+                    res = cr.fetchone()
+                    if res and len(res):
+                        self.db_name_list.append(db_name)
+                    cr.commit()
+                except Exception, e:
+                    log(e)
             finally:
                 if cr is not None:
                     cr.close()
@@ -794,8 +798,7 @@ class abstracted_fs:
         if 'd' in perms:
             permdir += 'p'
         type = size = perm = modify = create = unique = mode = uid = gid = ""
-        for basename in listing:
-            file = os.path.join(basedir, basename)
+        for file in listing:                        
             try:
                 st = self.stat(file)
             except OSError:
@@ -805,12 +808,7 @@ class abstracted_fs:
             # type + perm
             if stat.S_ISDIR(st.st_mode):
                 if 'type' in facts:
-                    if basename == '.':
-                        type = 'type=cdir;'
-                    elif basename == '..':
-                        type = 'type=pdir;'
-                    else:
-                        type = 'type=dir;'
+                    type = 'type=dir;'                    
                 if 'perm' in facts:
                     perm = 'perm=%s;' %permdir
             else:
@@ -852,9 +850,9 @@ class abstracted_fs:
             # on Windows NTFS filesystems MTF records could be used).
             if 'unique' in facts:
                 unique = "unique=%x%x;" %(st.st_dev, st.st_ino)
-            basename=_to_decode(basename)
+            path=_to_decode(file.path)
             yield "%s%s%s%s%s%s%s%s%s %s\r\n" %(type, size, perm, modify, create,
-                                                mode, uid, gid, unique, basename)
+                                                mode, uid, gid, unique, path)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/document/i18n/fr_FR.po b/addons/document/i18n/fr_FR.po
index 0ee8d957355..c88ecf0d8d8 100644
--- a/addons/document/i18n/fr_FR.po
+++ b/addons/document/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:49+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
 #: code:addons/document/document.py:0
@@ -23,8 +24,13 @@ msgstr "Le nom du répertoire ne doit pas contenir de caractères spéciaux!"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
-msgid "Select an object here and Open ERP will create a mapping for each of these objects, using the given domain, when browsing through FTP."
-msgstr "Sélectionnez un objet ici et open ERP créera un répertoire pour chaque occurrence de l'objet en fonction du domaine utilisé lorsque vous parcourrez les fichiers à travers le FTP"
+msgid ""
+"Select an object here and Open ERP will create a mapping for each of these "
+"objects, using the given domain, when browsing through FTP."
+msgstr ""
+"Sélectionnez un objet ici et open ERP créera un répertoire pour chaque "
+"occurrence de l'objet en fonction du domaine utilisé lorsque vous parcourrez "
+"les fichiers à travers le FTP"
 
 #. module: document
 #: constraint:ir.actions.act_window:0
@@ -38,8 +44,12 @@ msgstr "Type de Contenu du Répertoire"
 
 #. module: document
 #: view:document.configuration.wizard:0
-msgid "This wizard will automatically configure the document management system according to modules installed on your system."
-msgstr "Cet assistant configurera automatiquement la gestion documentaire en fonction des modules installés sur votre système"
+msgid ""
+"This wizard will automatically configure the document management system "
+"according to modules installed on your system."
+msgstr ""
+"Cet assistant configurera automatiquement la gestion documentaire en "
+"fonction des modules installés sur votre système"
 
 #. module: document
 #: field:document.directory,file_ids:0
@@ -59,8 +69,12 @@ msgstr "Gestion des Documents"
 
 #. module: document
 #: help:document.configuration.wizard,host:0
-msgid "Put here the server address or IP. Keep localhost if you don't know what to write."
-msgstr "Saisissez l'adresse du serveur ou son IP. (Laissez localhost si vous ne savez pas quoi écrire)"
+msgid ""
+"Put here the server address or IP. Keep localhost if you don't know what to "
+"write."
+msgstr ""
+"Saisissez l'adresse du serveur ou son IP. (Laissez localhost si vous ne "
+"savez pas quoi écrire)"
 
 #. module: document
 #: view:ir.attachment:0
@@ -171,12 +185,15 @@ msgstr "Le nom du répertoire doit être unique!"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
-msgid "Check this if you want to use the same tree structure as the object selected in the system."
+msgid ""
+"Check this if you want to use the same tree structure as the object selected "
+"in the system."
 msgstr ""
 
 #. module: document
 #: help:document.directory,domain:0
-msgid "Use a domain if you want to apply an automatic filter on visible resources."
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
 msgstr ""
 
 #. module: document
@@ -308,7 +325,9 @@ msgstr "Configurer le Répertoire"
 
 #. module: document
 #: model:ir.actions.todo,note:document.config_auto_directory
-msgid "This wizard will configure the URL of the server of the document management system."
+msgid ""
+"This wizard will configure the URL of the server of the document management "
+"system."
 msgstr ""
 
 #. module: document
@@ -390,8 +409,13 @@ msgstr "Créateur"
 
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
-msgid "If you put an object here, this directory template will appear bellow all of these objects. Don't put a parent directory if you select a parent model."
-msgstr "Si vous mettez un objet ici, ce répertoire modèle apparaîtra en dessous de tous ces objets. Ne pas mettre de répertoire parent si vous sélectionnez un modèle parent"
+msgid ""
+"If you put an object here, this directory template will appear bellow all of "
+"these objects. Don't put a parent directory if you select a parent model."
+msgstr ""
+"Si vous mettez un objet ici, ce répertoire modèle apparaîtra en dessous de "
+"tous ces objets. Ne pas mettre de répertoire parent si vous sélectionnez un "
+"modèle parent"
 
 #. module: document
 #: view:document.directory:0
@@ -415,13 +439,20 @@ msgstr ""
 
 #. module: document
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: document
 #: help:document.directory.content,include_name:0
-msgid "Check this field if you want that the name of the file start by the record name."
-msgstr "Cochez cette case si vous souhaitez que le nom du fichier commence par le nom de l'enregistrement"
+msgid ""
+"Check this field if you want that the name of the file start by the record "
+"name."
+msgstr ""
+"Cochez cette case si vous souhaitez que le nom du fichier commence par le "
+"nom de l'enregistrement"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -456,11 +487,11 @@ msgstr "Parcourir les fichiers via FTP"
 
 #. module: document
 #: model:ir.module.module,description:document.module_meta_information
-msgid "This is a complete document management system:\n"
+msgid ""
+"This is a complete document management system:\n"
 "    * FTP Interface\n"
 "    * User Authentication\n"
 "    * Document Indexation\n"
-""
 msgstr ""
 
 #. module: document
@@ -493,4 +524,3 @@ msgstr "Configuration Automatique"
 #: field:document.directory.content,extension:0
 msgid "Document Type"
 msgstr "Type de document"
-
diff --git a/addons/document_ics/i18n/fr_FR.po b/addons/document_ics/i18n/fr_FR.po
index 114e7e492a1..2b73a350b9f 100644
--- a/addons/document_ics/i18n/fr_FR.po
+++ b/addons/document_ics/i18n/fr_FR.po
@@ -6,19 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:18+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_ics
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -87,7 +91,9 @@ msgstr ""
 
 #. module: document_ics
 #: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
-msgid "This Configuration step use to create Calendars in document for all Case Sections"
+msgid ""
+"This Configuration step use to create Calendars in document for all Case "
+"Sections"
 msgstr ""
 
 #. module: document_ics
@@ -103,7 +109,9 @@ msgstr ""
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,jobs:0
-msgid "Help you to organise the jobs hiring process: evaluation, meetings, email integration..."
+msgid ""
+"Help you to organise the jobs hiring process: evaluation, meetings, email "
+"integration..."
 msgstr ""
 
 #. module: document_ics
@@ -124,7 +132,8 @@ msgstr ""
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,fund:0
-msgid "This may help associations in their fund raising process and tracking."
+msgid ""
+"This may help associations in their fund raising process and tracking."
 msgstr ""
 
 #. module: document_ics
@@ -184,7 +193,9 @@ msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,lead:0
-msgid "Allows you to track and manage prospects which are pre-sales requests or contacts, the very first contact with a customer request."
+msgid ""
+"Allows you to track and manage prospects which are pre-sales requests or "
+"contacts, the very first contact with a customer request."
 msgstr ""
 
 #. module: document_ics
@@ -204,7 +215,9 @@ msgstr "Domaine"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,claims:0
-msgid "Manages the supplier and customers claims, including your corrective or preventive actions."
+msgid ""
+"Manages the supplier and customers claims, including your corrective or "
+"preventive actions."
 msgstr ""
 
 #. module: document_ics
@@ -234,7 +247,9 @@ msgstr ""
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
-msgid "Help you to encode the result of a phone call or to planify a list of phone calls to process."
+msgid ""
+"Help you to encode the result of a phone call or to planify a list of phone "
+"calls to process."
 msgstr ""
 
 #. module: document_ics
@@ -316,4 +331,3 @@ msgstr ""
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstamp"
 msgstr ""
-
diff --git a/addons/document_ics/security/ir.model.access.csv b/addons/document_ics/security/ir.model.access.csv
index a89c5b296a7..b17f4507c02 100644
--- a/addons/document_ics/security/ir.model.access.csv
+++ b/addons/document_ics/security/ir.model.access.csv
@@ -1,3 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_document_directory_ics_fields_all","document.directory.ics.fields all","model_document_directory_ics_fields",,1,0,0,0
 "access_document_directory_ics_fields_manager","document.directory.ics.fields group system","model_document_directory_ics_fields","base.group_system",1,1,1,1
+"access_document_ics_crm_wizard","document.ics.crm.wizard","model_document_ics_crm_wizard","base.group_system",1,1,1,1
+\ No newline at end of file
diff --git a/addons/event/i18n/fr_FR.po b/addons/event/i18n/fr_FR.po
index f01a5332a59..0292e6b4b03 100644
--- a/addons/event/i18n/fr_FR.po
+++ b/addons/event/i18n/fr_FR.po
@@ -1,6 +1,7 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* event
+# French translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
 msgid ""
 msgstr ""
@@ -8,10 +9,10 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-04-10 12:38+0000\n"
 "PO-Revision-Date: 2009-04-20 06:41+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-11 08:08+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
diff --git a/addons/event_project/i18n/fr_FR.po b/addons/event_project/i18n/fr_FR.po
index 0ccbfa79431..3d16667ef71 100644
--- a/addons/event_project/i18n/fr_FR.po
+++ b/addons/event_project/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:21+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:07+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: event_project
 #: constraint:ir.ui.view:0
@@ -33,10 +34,11 @@ msgstr ""
 
 #. module: event_project
 #: model:ir.module.module,description:event_project.module_meta_information
-msgid "Organization and management of events.\n"
+msgid ""
+"Organization and management of events.\n"
 "\n"
-"    This module allow you to create retro planning for managing your events.\n"
-""
+"    This module allow you to create retro planning for managing your "
+"events.\n"
 msgstr ""
 
 #. module: event_project
@@ -64,7 +66,9 @@ msgstr "Tâches du projet"
 #. module: event_project
 #: code:addons/event_project/wizard/event_task.py:0
 #, python-format
-msgid "No project defined for this event.\nYou can create one with the retro-planning button !"
+msgid ""
+"No project defined for this event.\n"
+"You can create one with the retro-planning button !"
 msgstr ""
 
 #. module: event_project
@@ -91,4 +95,3 @@ msgstr "Évènement"
 #: view:event.event:0
 msgid "Tasks management"
 msgstr "Gestion des Tâches"
-
diff --git a/addons/google_map/i18n/fr_FR.po b/addons/google_map/i18n/fr_FR.po
index 37963ea916c..b845ead5ee1 100644
--- a/addons/google_map/i18n/fr_FR.po
+++ b/addons/google_map/i18n/fr_FR.po
@@ -4,28 +4,32 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:38+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 13:52+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
-msgid "The module adds google map field in partner address\n"
+msgid ""
+"The module adds google map field in partner address\n"
 "so that we can directly open google map from the\n"
 "url widget."
 msgstr ""
+"Ce module ajoute un champ Google Map sur l'adresse partenaire\n"
+"qui vous permet d'ouvrir directement Google Map depuis le composant URL."
 
 #. module: google_map
 #: model:ir.actions.wizard,name:google_map.wizard_google_map
 msgid "Launch Google Map"
-msgstr ""
+msgstr "Lancer Google Map"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
@@ -43,4 +47,3 @@ msgstr "Adresse suite "
 #: view:res.partner.address:0
 msgid "Map"
 msgstr "Carte"
-
diff --git a/addons/hr/i18n/fr_FR.po b/addons/hr/i18n/fr_FR.po
index bac97a1183b..c1d3a9f3a00 100644
--- a/addons/hr/i18n/fr_FR.po
+++ b/addons/hr/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-11 13:40+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-11 13:44+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
diff --git a/addons/hr_attendance/i18n/fr_FR.po b/addons/hr_attendance/i18n/fr_FR.po
index fae721b5bd9..2f61aa67724 100644
--- a/addons/hr_attendance/i18n/fr_FR.po
+++ b/addons/hr_attendance/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:47+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_attendance
 #: field:hr.employee,state:0
@@ -23,8 +24,11 @@ msgstr "Pointage"
 
 #. module: hr_attendance
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,init:0
@@ -38,13 +42,18 @@ msgstr "Pointer"
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:0
 #, python-format
-msgid "You tried to sign with a date anterior to another event !\nTry to contact the administrator to correct attendances."
+msgid ""
+"You tried to sign with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
 msgstr ""
 
 #. module: hr_attendance
 #: rml:report.hr.timesheet.attendance.error:0
-msgid "(*) A positive delay means that the employee worked less than recorded."
-msgstr "(*) Un délai positif veut dire que l'employé a travaillé moins que ce qu'il a encodé."
+msgid ""
+"(*) A positive delay means that the employee worked less than recorded."
+msgstr ""
+"(*) Un délai positif veut dire que l'employé a travaillé moins que ce qu'il "
+"a encodé."
 
 #. module: hr_attendance
 #: view:hr.attendance:0
@@ -131,7 +140,9 @@ msgstr "Période totale :"
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:0
 #, python-format
-msgid "You tried to sign out with a date anterior to another event !\nTry to contact the administrator to correct attendances."
+msgid ""
+"You tried to sign out with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
 msgstr ""
 
 #. module: hr_attendance
@@ -159,7 +170,8 @@ msgstr ""
 #: code:addons/hr_attendance/wizard/sign_in_out.py:0
 #, python-format
 msgid "A sign-out must be right after a sign-in !"
-msgstr "Un pointage de sortie doit immédiatement suivre un pointage d'entrée !"
+msgstr ""
+"Un pointage de sortie doit immédiatement suivre un pointage d'entrée !"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -215,8 +227,12 @@ msgstr ""
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,si_ask_so:0
-msgid "You did not signed out the last time. Please enter the date and time you signed out."
-msgstr "Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure à laquelle vous êtes parti(e)"
+msgid ""
+"You did not signed out the last time. Please enter the date and time you "
+"signed out."
+msgstr ""
+"Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure "
+"à laquelle vous êtes parti(e)"
 
 #. module: hr_attendance
 #: view:hr.action.reason:0
@@ -382,8 +398,12 @@ msgstr ""
 
 #. module: hr_attendance
 #: wizard_view:hr.si_so,so_ask_si:0
-msgid "You did not signed in the last time. Please enter the date and time you signed in."
-msgstr "Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure à laquelle vous êtes arrivé(e)"
+msgid ""
+"You did not signed in the last time. Please enter the date and time you "
+"signed in."
+msgstr ""
+"Vous n'avez pas pointé la dernière fois. Veuillez entrer la date et l'heure "
+"à laquelle vous êtes arrivé(e)"
 
 #. module: hr_attendance
 #: selection:hr.attendance.print_month,init,month:0
@@ -444,7 +464,9 @@ msgstr "Operation"
 #. module: hr_attendance
 #: code:addons/hr_attendance/hr_attendance.py:0
 #, python-format
-msgid "You tried to sign in with a date anterior to another event !\nTry to contact the administrator to correct attendances."
+msgid ""
+"You tried to sign in with a date anterior to another event !\n"
+"Try to contact the administrator to correct attendances."
 msgstr ""
 
 #. module: hr_attendance
@@ -456,5 +478,5 @@ msgstr "Votre dernier pointage"
 #: code:addons/hr_attendance/wizard/sign_in_out.py:0
 #, python-format
 msgid "A sign-in must be right after a sign-out !"
-msgstr "Un pointage d'entrée doit immédiatement suivre un pointage de sortie !"
-
+msgstr ""
+"Un pointage d'entrée doit immédiatement suivre un pointage de sortie !"
diff --git a/addons/hr_contract/i18n/fr_FR.po b/addons/hr_contract/i18n/fr_FR.po
index ba60a1b3522..52639d5ce5f 100644
--- a/addons/hr_contract/i18n/fr_FR.po
+++ b/addons/hr_contract/i18n/fr_FR.po
@@ -4,16 +4,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:45+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:20+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_contract
 #: view:hr.contract.wage.type:0
@@ -27,8 +28,11 @@ msgstr "Brut"
 
 #. module: hr_contract
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -54,7 +58,7 @@ msgstr "Types de Salaire"
 #. module: hr_contract
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nom du model invalide pour la définition de l'action."
 
 #. module: hr_contract
 #: field:hr.contract,employee_id:0
@@ -69,7 +73,7 @@ msgstr "Net"
 #. module: hr_contract
 #: model:ir.module.module,shortdesc:hr_contract.module_meta_information
 msgid "Human Resources Contracts"
-msgstr ""
+msgstr "Contrats Ressources Humaines"
 
 #. module: hr_contract
 #: field:hr.contract.wage.type.period,factor_days:0
@@ -182,7 +186,7 @@ msgstr "Période Salariale"
 #. module: hr_contract
 #: field:hr.employee,audiens_num:0
 msgid "AUDIENS Number"
-msgstr ""
+msgstr "Numéro AUDIENS"
 
 #. module: hr_contract
 #: view:hr.contract:0
@@ -223,8 +227,12 @@ msgstr "Période Salariale"
 #. module: hr_contract
 #: help:hr.contract.wage.type,factor_type:0
 #: help:hr.contract.wage.type.period,factor_days:0
-msgid "This field is used by the timesheet system to compute the price of an hour of work wased on the contract of the employee"
-msgstr "Ce champ est utilisé par le système de feuille de temps pour calculer le prix d'une heure de travail basé sur le contrat de l'employé"
+msgid ""
+"This field is used by the timesheet system to compute the price of an hour "
+"of work wased on the contract of the employee"
+msgstr ""
+"Ce champ est utilisé par le système de feuille de temps pour calculer le "
+"prix d'une heure de travail basé sur le contrat de l'employé"
 
 #. module: hr_contract
 #: field:hr.contract,wage:0
@@ -246,4 +254,3 @@ msgstr "Description du Statut"
 #: view:hr.employee:0
 msgid "Contract Duration"
 msgstr "Durée du Contrat"
-
diff --git a/addons/hr_expense/i18n/fr_FR.po b/addons/hr_expense/i18n/fr_FR.po
index dc7236e57d4..565e0070c28 100644
--- a/addons/hr_expense/i18n/fr_FR.po
+++ b/addons/hr_expense/i18n/fr_FR.po
@@ -6,14 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:56+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: hr_expense
+#: selection:hr.expense.expense,state:0
+msgid "Cancelled"
+msgstr "Annulée"
+
+#. module: hr_expense
+#: help:product.product,hr_expense_ok:0
+msgid ""
+"Determine if the product can be visible in the list of product within a "
+"selection from an HR expense sheet line."
+msgstr ""
+"Détermine si le produit peut être visible dans le liste des produits dans la "
+"sélection d'une ligne de dépense."
+
+#. module: hr_expense
+#: field:hr.expense.expense,date_valid:0
+msgid "Date Validated"
+msgstr "Date de validation"
+
+#. module: hr_expense
+#: rml:hr.expense:0
+msgid "This document must be dated and signed for reimbursement"
+msgstr "Ce document doit être dater et signer pour le remboursement"
+
+#. module: hr_expense
+#: field:product.product,hr_expense_ok:0
+msgid "Can be Expensed"
+msgstr "Peut être dépenser"
 
 #. module: hr_expense
 #: model:process.node,name:hr_expense.process_node_confirmedexpenses0
@@ -90,21 +120,11 @@ msgid "Notes"
 msgstr "Notes"
 
 #. module: hr_expense
-#: selection:hr.expense.expense,state:0
-msgid "Cancelled"
-msgstr ""
-
-#. module: hr_expense
 #: view:hr.expense.expense:0
 msgid "Validation"
 msgstr "Validation"
 
 #. module: hr_expense
-#: help:product.product,hr_expense_ok:0
-msgid "Determine if the product can be visible in the list of product within a selection from an HR expense sheet line."
-msgstr ""
-
-#. module: hr_expense
 #: selection:hr.expense.expense,state:0
 msgid "Accepted"
 msgstr "Accepté"
@@ -145,7 +165,9 @@ msgstr ""
 #. module: hr_expense
 #: code:addons/hr_expense/hr_expense.py:0
 #, python-format
-msgid "Please configure Default Expanse account for Product purchase, `property_account_expense_categ`"
+msgid ""
+"Please configure Default Expanse account for Product purchase, "
+"`property_account_expense_categ`"
 msgstr ""
 
 #. module: hr_expense
@@ -289,8 +311,11 @@ msgstr "Brouillon"
 
 #. module: hr_expense
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
@@ -335,11 +360,6 @@ msgid "HR Expenses"
 msgstr "Dépense HR"
 
 #. module: hr_expense
-#: field:hr.expense.expense,date_valid:0
-msgid "Date Validated"
-msgstr ""
-
-#. module: hr_expense
 #: field:hr.expense.expense,account_move_id:0
 msgid "Account Move"
 msgstr "Mouvement de Compte"
@@ -426,11 +446,6 @@ msgid "Accept"
 msgstr "Accepter"
 
 #. module: hr_expense
-#: rml:hr.expense:0
-msgid "This document must be dated and signed for reimbursement"
-msgstr ""
-
-#. module: hr_expense
 #: model:process.transition,note:hr_expense.process_transition_refuseexpense0
 msgid "Expense is refused."
 msgstr ""
@@ -474,11 +489,6 @@ msgid "Refused"
 msgstr "Refusée"
 
 #. module: hr_expense
-#: field:product.product,hr_expense_ok:0
-msgid "Can be Expensed"
-msgstr ""
-
-#. module: hr_expense
 #: rml:hr.expense:0
 msgid "Ref."
 msgstr ""
@@ -538,4 +548,3 @@ msgstr "Total"
 #: model:process.node,name:hr_expense.process_node_reinvoicing0
 msgid "Reinvoicing"
 msgstr ""
-
diff --git a/addons/hr_holidays/i18n/fr_FR.po b/addons/hr_holidays/i18n/fr_FR.po
index ae4de5edb6d..a6bfe704e3b 100644
--- a/addons/hr_holidays/i18n/fr_FR.po
+++ b/addons/hr_holidays/i18n/fr_FR.po
@@ -1,733 +1,18 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* hr_holidays
+# French translation for openobject-addons
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-04-10 12:59+0000\n"
+"PO-Revision-Date: 2009-04-20 08:37+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays_new
-msgid "New Holidays Request"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_all_holiday
-msgid "All Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.per.user,remaining_leaves:0
-msgid "Remaining Leaves"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_holiday_waiting
-msgid "Requests Awaiting for Validation"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Blue"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Brown"
-msgstr ""
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "of the"
-msgstr ""
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "Off-Days' Summary"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: view:hr.holidays.per.user:0
-#: model:process.transition,name:hr_holidays.process_transition_employeeholidays0
-msgid "Employee Holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr.py:0
-#, python-format
-msgid "Warning !"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-msgid "Set to Draft"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays.per.user:0
-#: field:hr.holidays.per.user,holiday_ids:0
-#: model:ir.model,name:hr_holidays.model_hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidays0
-msgid "Holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "to"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Cyan"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Green"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_employeedeclaration0
-msgid "Employee Declaration"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: selection:hr.holidays,state:0
-#: model:process.transition.action,name:hr_holidays.process_transition_action_validate0
-msgid "Validate"
-msgstr "Valider"
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_refusedrequest0
-msgid "Refused Request"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_approved0
-msgid "Approved"
-msgstr "Approuvé"
-
-#. module: hr_holidays
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
-msgid "Both"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-msgid "Refuse"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_button:hr.holidays.summary,notify,end:0
-#: wizard_button:hr.holidays.summary.employee,notify,end:0
-msgid "Ok"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday
-msgid "My Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,notes:0
-#: field:hr.holidays.per.user,notes:0
-msgid "Notes"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,holiday_status:0
-#: field:hr.holidays.log,holiday_status:0
-#: field:hr.holidays.per.user,holiday_status:0
-msgid "Holiday's Status"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_refusedrequest0
-msgid "Request is refused."
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_open_ask_holidays
-msgid "Holidays Management"
-msgstr ""
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "Analyze from"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.report.xml,name:hr_holidays.report_holidays_summary
-msgid "Summary Of Holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_calendar0
-msgid "The holiday is set in the calendar"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays.status:0
-msgid "Holiday status"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays_status
-msgid "Holidays Status"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,date_to:0
-msgid "Vacation end day"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays.per.user:0
-msgid "Holidays Allowed"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_legaldeclaration0
-msgid "Legal Declaration Document to declare new employee"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Magenta"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays_per_user
-msgid "Holidays Per User"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays.status:0
-msgid "Define holiday status"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
-msgid "Confirmed"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,date_from:0
-#: wizard_field:hr.holidays.summary.employee,init,date_from:0
-msgid "From"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: model:process.transition.action,name:hr_holidays.process_transition_action_confirm0
-msgid "Confirm"
-msgstr "Confirmer"
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_waiting
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_waiting
-msgid "My Awaiting Confirmation Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,user_id:0
-msgid "Employee_id"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidaysdefinition0
-msgid "Encoding of annual available holidays."
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,employee_id:0
-#: field:hr.holidays.log,employee_id:0
-#: field:hr.holidays.per.user,employee_id:0
-msgid "Employee"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,state:0
-msgid "Waiting Validation"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_employeeholidays0
-msgid "Employee get holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Salmon"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Wheat"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.log,nb_holidays:0
-msgid "Number of Holidays Requested"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.act_hr_employee_holiday_request
-msgid "My Holiday Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: view:hr.holidays.per.user:0
-msgid "Number of Days"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.status,name:0
-#: model:ir.actions.act_window,name:hr_holidays.open_view_holiday_status
-#: model:ir.ui.menu,name:hr_holidays.menu_open_view_holiday_status
-msgid "Holiday Status"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_view:hr.holidays.summary,init:0
-#: wizard_view:hr.holidays.summary.employee,init:0
-msgid "Report Options"
-msgstr ""
-
-#. module: hr_holidays
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_approved0
-msgid "His manager approves the request"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_holidaysdefrequest0
-msgid "If holidays available, employee can take it and fill it."
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_view:hr.holidays.summary.employee,notify:0
-msgid "You have to select at least 1 Employee. Try again."
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_validate
-msgid "My Validated Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_field:hr.holidays.summary.employee,init,emp:0
-msgid "Employee(s)"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,number_of_days:0
-msgid "Number of Days in this Holiday Request"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays.per.user:0
-#: model:ir.actions.act_window,name:hr_holidays.action_holidays_per_user
-#: model:ir.ui.menu,name:hr_holidays.menu_open_holidays_per_user
-msgid "Holidays Per Employee"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.status,limit:0
-msgid "Allow to override Limit"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.log,holiday_user_id:0
-msgid "Holidays user"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Lavender"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.model,name:hr_holidays.model_hr_holidays_log
-msgid "hr.holidays.log"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.wizard,name:hr_holidays.wizard_holidays_summary
-msgid "Print Summary of Employee's Holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_calendar0
-msgid "Calendar"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,date_from:0
-msgid "Vacation start day"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_view:hr.holidays.summary,notify:0
-#: wizard_view:hr.holidays.summary.employee,notify:0
-msgid "Notification"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidaysrequest0
-msgid "Employee fills in a request for holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_setholiday0
-msgid "Holiday is set in the calendar."
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Coral"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_available
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_available
-msgid "My Available Holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Black"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_refuse
-msgid "My Refused Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_setholiday0
-msgid "Set Holiday"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_my_holiday_draft
-msgid "My Draft Holidays Requests"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.per.user,max_leaves:0
-msgid "Maximum Leaves Allowed"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,state:0
-msgid "Status"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Ivory"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday
-msgid "My Holidays Request"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.status,color_name:0
-msgid "Color of the status"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.module.module,description:hr_holidays.module_meta_information
-msgid "Human Ressources: Holidays tracking and workflow\n"
-"\n"
-"    This module allows you to manage holidays and holidays requests. For each employee, you can also define a number of available holidays per holiday status.\n"
-"\n"
-"    Note that:\n"
-"    - A synchronisation with an internal agenda (use of the CRM module) is possible: in order to automatically create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your colour preferences in\n"
-"                HR / Configuration / Holidays Status\n"
-"    - An employee can make a negative holiday request (holiday request of -2 days for example), this is considered by the system as an ask for more off-days. It will increase his total of that holiday status available (if the request is accepted).\n"
-"    - There are two ways to print the employee's holidays:\n"
-"        * The first will allow to choose employees by department and is used by clicking the menu item located in\n"
-"                HR / Holidays Request / Print Summary of Holidays\n"
-"        * The second will allow you to choose the holidays report for specific employees. Go on the list\n"
-"                HR / Employees / Employees\n"
-"            then select the ones you want to choose, click on the print icon and select the option\n"
-"                'Print Summary of Employee's Holidays'\n"
-"    - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR' and with the role 'holidays'. You can define these features in the security tab from the user data in\n"
-"                Administration / Users / Users\n"
-"            for example, you maybe will do it for the user 'admin'.\n"
-""
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
-msgid "Both Validated and Confirmed"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.per.user,leaves_taken:0
-msgid "Leaves Already Taken"
-msgstr ""
-
-#. module: hr_holidays
-#: xsl:holidays.summary:0
-msgid "holidays."
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,state:0
-msgid "draft"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.per.user,user_id:0
-msgid "User"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_employeedeclaration0
-msgid "Document for employee"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.log,date:0
-msgid "Date"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition.action,name:hr_holidays.process_transition_action_reufse0
-msgid "Reufse"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.status,section_id:0
-msgid "Section"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr.py:0
-#, python-format
-msgid "Attention!"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,manager_id:0
-msgid "Holiday manager"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.per.user,active:0
-#: field:hr.holidays.status,active:0
-msgid "Active"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_draft
-msgid "My Holidays Request Draft"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr.py:0
-#, python-format
-msgid "You can not cancel this holiday request. first You have to make its case in draft state."
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_approvedrequest0
-msgid "Approved Request"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidaysrequest0
-msgid "Holidays Request"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.ui.menu,name:hr_holidays.menu_action_holiday_waiting
-msgid "Holidays Requests Awaiting for Validation"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-msgid "General"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays.per.user:0
-msgid "General Information"
-msgstr ""
-
-#. module: hr_holidays
-#: view:hr.holidays:0
-#: selection:hr.holidays,state:0
-#: wizard_button:hr.holidays.summary,init,end:0
-#: wizard_button:hr.holidays.summary.employee,init,end:0
-msgid "Cancel"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.transition,name:hr_holidays.process_transition_holidaysdefrequest0
-msgid "Holidays def Request"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.summary,init,holiday_type:0
-#: selection:hr.holidays.summary.employee,init,holiday_type:0
-msgid "Validated"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_refuse
-msgid "My Holidays Request Refused"
-msgstr ""
-
-#. module: hr_holidays
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
-
-#. module: hr_holidays
-#: wizard_button:hr.holidays.summary,init,checkdept:0
-#: wizard_button:hr.holidays.summary.employee,init,checkemp:0
-msgid "Print"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.wizard,name:hr_holidays.holidays_summary
-#: model:ir.ui.menu,name:hr_holidays.menu_holidays_summary
-msgid "Print Summary of Holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,depts:0
-msgid "Department(s)"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,name:0
-msgid "Description"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays,state:0
-#: model:process.node,name:hr_holidays.process_node_refused0
-msgid "Refused"
-msgstr "Refusée"
-
-#. module: hr_holidays
-#: model:process.transition,note:hr_holidays.process_transition_approvedrequest0
-msgid "Request is approved."
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_holidaysdefinition0
-msgid "Holidays Definition"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_field:hr.holidays.summary,init,holiday_type:0
-#: wizard_field:hr.holidays.summary.employee,init,holiday_type:0
-msgid "Select Holiday Type"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,case_id:0
-msgid "Case"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays,holiday_user_id:0
-msgid "Holiday per user"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_holidays0
-msgid "Encode number of available holidays"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,name:hr_holidays.process_node_legaldeclaration0
-msgid "Secretariat Social"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Violet"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Red"
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.module.module,shortdesc:hr_holidays.module_meta_information
-msgid "Human Resources: Holidays management"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.process,name:hr_holidays.process_process_holidaysprocess0
-msgid "Holidays Process"
-msgstr ""
-
-#. module: hr_holidays
-#: wizard_view:hr.holidays.summary,notify:0
-msgid "You have to select at least 1 Department. Try again."
-msgstr ""
-
-#. module: hr_holidays
-#: model:ir.actions.act_window,name:hr_holidays.action_my_holiday_validate
-msgid "My Holidays Request Validated"
-msgstr ""
-
-#. module: hr_holidays
-#: field:hr.holidays.log,holiday_req_id:0
-msgid "Holiday Request ID"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Yellow"
-msgstr ""
-
-#. module: hr_holidays
-#: selection:hr.holidays.status,color_name:0
-msgid "Light Pink"
-msgstr ""
-
-#. module: hr_holidays
-#: model:process.node,note:hr_holidays.process_node_refused0
-msgid "His manager refuses the request"
-msgstr ""
-
-#. module: hr_holidays
-#: code:addons/hr_holidays/hr.py:0
-#, python-format
-msgid "You Cannot Validate leaves while available leaves are less than asked leaves."
-msgstr ""
-
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:22+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
diff --git a/addons/hr_timesheet/i18n/fr_FR.po b/addons/hr_timesheet/i18n/fr_FR.po
index fe640612911..b93ac278962 100644
--- a/addons/hr_timesheet/i18n/fr_FR.po
+++ b/addons/hr_timesheet/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:44+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/report/user_timesheet.py:0
@@ -194,7 +195,9 @@ msgstr ""
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:0
 #, python-format
-msgid "No analytic journal available for this employee.\nDefine an employee for the selected user and assign an analytic journal."
+msgid ""
+"No analytic journal available for this employee.\n"
+"Define an employee for the selected user and assign an analytic journal."
 msgstr ""
 
 #. module: hr_timesheet
@@ -232,7 +235,9 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: hr_timesheet
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Erreur: l'unité de vente doit appartenir à une catégorie différente que l'unité de mesure"
+msgstr ""
+"Erreur: l'unité de vente doit appartenir à une catégorie différente que "
+"l'unité de mesure"
 
 #. module: hr_timesheet
 #: wizard_view:hr.analytical.timesheet_users,init:0
@@ -328,8 +333,11 @@ msgstr "Ven"
 
 #. module: hr_timesheet
 #: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent faire partie de la même catégorie"
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
 
 #. module: hr_timesheet
 #: wizard_view:hr_timesheet.si_so,sign_out:0
@@ -406,7 +414,9 @@ msgstr "Octobre"
 #. module: hr_timesheet
 #: code:addons/hr_timesheet/hr_timesheet.py:0
 #, python-format
-msgid "No analytic account defined on the project.\nPlease set one or we can not automatically fill the timesheet."
+msgid ""
+"No analytic account defined on the project.\n"
+"Please set one or we can not automatically fill the timesheet."
 msgstr ""
 
 #. module: hr_timesheet
@@ -469,8 +479,11 @@ msgstr "Choisissez le mois"
 
 #. module: hr_timesheet
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: hr_timesheet
 #: model:product.uom.categ,name:hr_timesheet.uom_categ_wtime
@@ -595,4 +608,3 @@ msgstr "Total"
 #: wizard_button:hr_timesheet.si_so,sign_in,so_result:0
 msgid "Change Work"
 msgstr "Changer de travail"
-
diff --git a/addons/hr_timesheet_invoice/i18n/fr_FR.po b/addons/hr_timesheet_invoice/i18n/fr_FR.po
index 5ae25138f5f..b113b57485f 100644
--- a/addons/hr_timesheet_invoice/i18n/fr_FR.po
+++ b/addons/hr_timesheet_invoice/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:18+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:18+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
 #: view:hr_timesheet_invoice.factor:0
@@ -58,8 +59,12 @@ msgstr "Période de début"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,price:0
-msgid "The cost of each work done will be displayed on the invoice. You probably don't want to check this."
-msgstr "Le coût de chaque travaux sera affiché sur la facture. Vous ne voulez probablement pas controler ceci."
+msgid ""
+"The cost of each work done will be displayed on the invoice. You probably "
+"don't want to check this."
+msgstr ""
+"Le coût de chaque travaux sera affiché sur la facture. Vous ne voulez "
+"probablement pas controler ceci."
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.wizard,name:hr_timesheet_invoice.hr_timesheet_invoice_create
@@ -90,7 +95,10 @@ msgstr "Montant facturé"
 
 #. module: hr_timesheet_invoice
 #: help:account.analytic.account,to_invoice:0
-msgid "Check this field if you plan to automatically generate invoices based on the costs in this analytic account: timesheets, expenses, ...You can configure an automatic invoice rate on analytic accounts."
+msgid ""
+"Check this field if you plan to automatically generate invoices based on the "
+"costs in this analytic account: timesheets, expenses, ...You can configure "
+"an automatic invoice rate on analytic accounts."
 msgstr ""
 
 #. module: hr_timesheet_invoice
@@ -123,7 +131,7 @@ msgstr ""
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
 #, python-format
 msgid "Analytic Account incomplete"
-msgstr ""
+msgstr "Compte Analytique incomplet"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -273,8 +281,13 @@ msgstr "Devise"
 
 #. module: hr_timesheet_invoice
 #: help:hr.timesheet.invoice.create,init,product:0
-msgid "Complete this field only if you want to force to use a specific product. Keep empty to use the real product that comes from the cost."
-msgstr "Compléter ce champ seulement si vous voulez forcer l'utilisation d'un produit spécifique. Laisser vide pour utiliser un produit réel qui viendra avec les coûts"
+msgid ""
+"Complete this field only if you want to force to use a specific product. "
+"Keep empty to use the real product that comes from the cost."
+msgstr ""
+"Compléter ce champ seulement si vous voulez forcer l'utilisation d'un "
+"produit spécifique. Laisser vide pour utiliser un produit réel qui viendra "
+"avec les coûts"
 
 #. module: hr_timesheet_invoice
 #: model:ir.actions.act_window,name:hr_timesheet_invoice.action_hr_analytic_timesheet_tree_invoiced
@@ -344,7 +357,7 @@ msgstr "Date"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
 #, python-format
 msgid "Please fill in the Address field in the Partner: %s."
-msgstr ""
+msgstr "Veuillez remplir le champ adresse dans le Partenaire; %s."
 
 #. module: hr_timesheet_invoice
 #: field:hr_timesheet_invoice.factor,factor:0
@@ -439,8 +452,11 @@ msgstr "Balance produit nécéssaire"
 
 #. module: hr_timesheet_invoice
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: hr_timesheet_invoice
 #: wizard_field:account.analytic.profit,init,employee_ids:0
@@ -461,7 +477,7 @@ msgstr "La date réelle de chaque travaux sera affiché sur la facture"
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
 #, python-format
 msgid "At least one line has no product !"
-msgstr ""
+msgstr "Au moins une des lignes n'a pas de produit"
 
 #. module: hr_timesheet_invoice
 #: wizard_view:hr.timesheet.invoice.create,init:0
@@ -497,8 +513,14 @@ msgstr ""
 #. module: hr_timesheet_invoice
 #: code:addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py:0
 #, python-format
-msgid "Please fill in the Associate Partner and Sale Pricelist fields in the Analytic Account:\n%s"
+msgid ""
+"Please fill in the Associate Partner and Sale Pricelist fields in the "
+"Analytic Account:\n"
+"%s"
 msgstr ""
+"Veuillez remplir le Partenaire Associé et la Liste de Prix de Vente dans le "
+"Compte Analytique :\n"
+"%s"
 
 #. module: hr_timesheet_invoice
 #: rml:account.analytic.profit:0
@@ -560,4 +582,3 @@ msgstr "Veuillez remplir la balance produit dans l'assistant"
 #: wizard_field:hr.timesheet.invoice.create,init,price:0
 msgid "Cost"
 msgstr "Coût"
-
diff --git a/addons/hr_timesheet_sheet/i18n/fr_FR.po b/addons/hr_timesheet_sheet/i18n/fr_FR.po
index 9048e3f6ea3..81d8e0deae4 100644
--- a/addons/hr_timesheet_sheet/i18n/fr_FR.po
+++ b/addons/hr_timesheet_sheet/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:21+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:21+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:29+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:20+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_sheet
 #: model:process.node,note:hr_timesheet_sheet.process_node_review0
@@ -22,7 +23,8 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: constraint:hr_timesheet_sheet.sheet:0
-msgid "You can not have 2 timesheets that overlaps !\n"
+msgid ""
+"You can not have 2 timesheets that overlaps !\n"
 "Please use the menu 'My Current Timesheet' to avoid this problem."
 msgstr ""
 
@@ -173,8 +175,12 @@ msgstr ""
 
 #. module: hr_timesheet_sheet
 #: help:res.company,timesheet_max_difference:0
-msgid "Allowed difference between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control."
-msgstr "La différence permise entre le sign in/out and le calcul de la timesheet pour une feuille. Mettez cette valeur à 0 si vous ne voulez aucun contrôle."
+msgid ""
+"Allowed difference between the sign in/out and the timesheet computation for "
+"one sheet. Set this to 0 if you do not want any control."
+msgstr ""
+"La différence permise entre le sign in/out and le calcul de la timesheet "
+"pour une feuille. Mettez cette valeur à 0 si vous ne voulez aucun contrôle."
 
 #. module: hr_timesheet_sheet
 #: view:hr_timesheet_sheet.sheet.day:0
@@ -279,8 +285,11 @@ msgstr "Lignes des Feuilles de Présence"
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
-msgid "Please verify that the total difference of the sheet is lower than %.2f !"
-msgstr "Merci de vérifier que la différence totale de la fiche est inférieure à %.2f !"
+msgid ""
+"Please verify that the total difference of the sheet is lower than %.2f !"
+msgstr ""
+"Merci de vérifier que la différence totale de la fiche est inférieure à %.2f "
+"!"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_confirmtimesheetsheet0
@@ -408,7 +417,8 @@ msgstr "Feuille de Feuilles de Présence"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
 msgid "You can not sign out from an other date than today"
-msgstr "Vous ne pouvez pas pointer la sortie pour un autre jour qu'aujourdhui"
+msgstr ""
+"Vous ne pouvez pas pointer la sortie pour un autre jour qu'aujourdhui"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,state:0
@@ -455,7 +465,8 @@ msgstr "Date"
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
 #, python-format
 msgid "You can not modify an entry in a confirmed timesheet !"
-msgstr "Vous ne pouvez pas modifier une entrée d'une feuille de temps confirmée !"
+msgstr ""
+"Vous ne pouvez pas modifier une entrée d'une feuille de temps confirmée !"
 
 #. module: hr_timesheet_sheet
 #: field:hr_timesheet_sheet.sheet,user_id:0
@@ -511,8 +522,11 @@ msgstr "Feuille de Feuilles de Présence"
 
 #. module: hr_timesheet_sheet
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: hr_timesheet_sheet
 #: code:addons/hr_timesheet_sheet/hr_timesheet_sheet.py:0
@@ -614,7 +628,8 @@ msgstr "Taux de facturation"
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_phonecallencoding0
 msgid "Encode how much time u spent on phone call"
-msgstr "Encoder combien de temps vous avez passé sur les appels téléphoniques"
+msgstr ""
+"Encoder combien de temps vous avez passé sur les appels téléphoniques"
 
 #. module: hr_timesheet_sheet
 #: model:process.transition,note:hr_timesheet_sheet.process_transition_reviewofwork0
@@ -663,4 +678,3 @@ msgstr "Total"
 #: model:ir.ui.menu,name:hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form_department_validate
 msgid "My Department's Timesheet to Validate"
 msgstr "Les feuilles de temps de mon département à valider"
-
diff --git a/addons/idea/i18n/fr_FR.po b/addons/idea/i18n/fr_FR.po
index b9615222d53..fff15e27bfe 100644
--- a/addons/idea/i18n/fr_FR.po
+++ b/addons/idea/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:46+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:15+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
 #: field:idea.category,name:0
@@ -104,8 +105,11 @@ msgstr "Statistiques sur les Votes"
 
 #. module: idea
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
@@ -210,7 +214,13 @@ msgstr "Votes"
 
 #. module: idea
 #: model:ir.module.module,description:idea.module_meta_information
-msgid "This module allows your user to easily and efficiently participate in the innovation of the enterprise. It allows everybody to express ideas about different subjects. Then, others users can comment these ideas and vote for particular ideas. Each idea as a score based on the different votes. The managers can obtain an easy view on best ideas from all the users. Once installed, check the menu 'Ideas' in the 'Tools' main menu."
+msgid ""
+"This module allows your user to easily and efficiently participate in the "
+"innovation of the enterprise. It allows everybody to express ideas about "
+"different subjects. Then, others users can comment these ideas and vote for "
+"particular ideas. Each idea as a score based on the different votes. The "
+"managers can obtain an easy view on best ideas from all the users. Once "
+"installed, check the menu 'Ideas' in the 'Tools' main menu."
 msgstr ""
 
 #. module: idea
@@ -370,4 +380,3 @@ msgstr "Ouvert"
 #: help:idea.idea,description:0
 msgid "Content of the idea"
 msgstr "Contenu de l'Idée"
-
diff --git a/addons/l10n_be/i18n/fr_FR.po b/addons/l10n_be/i18n/fr_FR.po
index 9f8be398ad6..2be1991be03 100644
--- a/addons/l10n_be/i18n/fr_FR.po
+++ b/addons/l10n_be/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-11 09:26+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-11 09:28+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:20+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_be
diff --git a/addons/l10n_ch/i18n/fr_FR.po b/addons/l10n_ch/i18n/fr_FR.po
index 4ac1ffb04dc..a2a23f8c1df 100644
--- a/addons/l10n_ch/i18n/fr_FR.po
+++ b/addons/l10n_ch/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:56+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:12+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch
 #: rml:l10n_ch.invoice.bvr:0
@@ -325,7 +326,9 @@ msgstr ""
 #. module: l10n_ch
 #: code:addons/l10n_ch/wizard/wizard_bvr.py:0
 #, python-format
-msgid "No bank specified on invoice:\n%s"
+msgid ""
+"No bank specified on invoice:\n"
+"%s"
 msgstr ""
 
 #. module: l10n_ch
@@ -494,8 +497,11 @@ msgstr ""
 
 #. module: l10n_ch
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: l10n_ch
 #: field:account.journal.todo,default_credit_account_id:0
@@ -586,8 +592,9 @@ msgstr ""
 
 #. module: l10n_ch
 #: model:ir.actions.todo,note:l10n_ch.action_config_journal_todo
-msgid "Set accounts on financial journals defined by\n"
-"			Camptocamp l10n_ch module"
+msgid ""
+"Set accounts on financial journals defined by\n"
+"\t\t\tCamptocamp l10n_ch module"
 msgstr ""
 
 #. module: l10n_ch
@@ -616,4 +623,3 @@ msgstr ""
 #: rml:l10n_ch.invoice.bvr:0
 msgid "Total"
 msgstr ""
-
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/fr_FR.po b/addons/l10n_ch_chart_c2c_pcg/i18n/fr_FR.po
index 8220b42622a..f0298e81589 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/fr_FR.po
+++ b/addons/l10n_ch_chart_c2c_pcg/i18n/fr_FR.po
@@ -6,19 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:40+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_ch_chart_c2c_pcg
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: l10n_ch_chart_c2c_pcg
 #: field:account.tax.template.todo,account_paid_id:0
@@ -27,8 +31,9 @@ msgstr ""
 
 #. module: l10n_ch_chart_c2c_pcg
 #: model:ir.actions.todo,note:l10n_ch_chart_c2c_pcg.action_config_tax_todo
-msgid "Set account on financial taxes defined by \n"
-"			Camptocamp l10n_ch_c2c_pcg module"
+msgid ""
+"Set account on financial taxes defined by \n"
+"\t\t\tCamptocamp l10n_ch_c2c_pcg module"
 msgstr ""
 
 #. module: l10n_ch_chart_c2c_pcg
@@ -73,7 +78,9 @@ msgstr ""
 
 #. module: l10n_ch_chart_c2c_pcg
 #: help:account.tax.template.todo,account_collected_id:0
-msgid "You can set                                                 here the invoice tax account"
+msgid ""
+"You can set                                                 here the invoice "
+"tax account"
 msgstr ""
 
 #. module: l10n_ch_chart_c2c_pcg
@@ -193,7 +200,9 @@ msgstr ""
 
 #. module: l10n_ch_chart_c2c_pcg
 #: help:account.tax.template.todo,account_paid_id:0
-msgid "You can set                                             here the refund tax account"
+msgid ""
+"You can set                                             here the refund tax "
+"account"
 msgstr ""
 
 #. module: l10n_ch_chart_c2c_pcg
@@ -238,8 +247,14 @@ msgstr ""
 
 #. module: l10n_ch_chart_c2c_pcg
 #: model:ir.actions.todo,note:l10n_ch_chart_c2c_pcg.config_call_account_template_l10n_ch
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-"                This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"                This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
 msgstr ""
 
 #. module: l10n_ch_chart_c2c_pcg
@@ -266,4 +281,3 @@ msgstr ""
 #: help:account.tax.template.todo,name:0
 msgid "The tax template you are currently editing"
 msgstr ""
-
diff --git a/addons/l10n_chart_uk_minimal/i18n/fr_FR.po b/addons/l10n_chart_uk_minimal/i18n/fr_FR.po
index ffdc4befcc0..ad62c518f24 100644
--- a/addons/l10n_chart_uk_minimal/i18n/fr_FR.po
+++ b/addons/l10n_chart_uk_minimal/i18n/fr_FR.po
@@ -4,16 +4,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:21+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:21+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:50+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:32+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_receivable
@@ -22,13 +23,16 @@ msgstr "Recevable"
 
 #. module: l10n_chart_uk_minimal
 #: model:ir.module.module,description:l10n_chart_uk_minimal.module_meta_information
-msgid "This is the base module to manage the accounting chart for United Kingdom in Open ERP."
+msgid ""
+"This is the base module to manage the accounting chart for United Kingdom in "
+"Open ERP."
 msgstr ""
 
 #. module: l10n_chart_uk_minimal
 #: constraint:account.account.template:0
 msgid "Error ! You can not create recursive account templates."
 msgstr ""
+"Erreur ! Vous ne pouvez pas créer de modèles de compte de manière récursive."
 
 #. module: l10n_chart_uk_minimal
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_income
@@ -47,8 +51,14 @@ msgstr "Liquidités"
 
 #. module: l10n_chart_uk_minimal
 #: model:ir.actions.todo,note:l10n_chart_uk_minimal.config_call_account_template_uk_minimal
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
 msgstr ""
 
 #. module: l10n_chart_uk_minimal
@@ -80,4 +90,3 @@ msgstr "Charges"
 #: model:account.account.type,name:l10n_chart_uk_minimal.account_type_view
 msgid "View"
 msgstr "Vue"
-
diff --git a/addons/l10n_fr/i18n/fr_FR.po b/addons/l10n_fr/i18n/fr_FR.po
index 1882099d14a..c0d6b633c7f 100644
--- a/addons/l10n_fr/i18n/fr_FR.po
+++ b/addons/l10n_fr/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 11:46+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
@@ -37,8 +38,14 @@ msgstr ""
 
 #. module: l10n_fr
 #: model:ir.actions.todo,note:l10n_fr.config_call_account_template_fr_pcg
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-"	This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to pass "
+"the name of the company, the chart template to follow, the no. of digits to "
+"generate the code for your accounts and Bank account, currency to create "
+"Journals. Thus,the pure copy of chart Template is generated.\n"
+"\tThis is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
 msgstr ""
 
 #. module: l10n_fr
@@ -410,10 +417,10 @@ msgstr ""
 
 #. module: l10n_fr
 #: model:ir.module.module,description:l10n_fr.module_meta_information
-msgid "This is the module to manage the accounting chart for France in Open ERP.\n"
+msgid ""
+"This is the module to manage the accounting chart for France in Open ERP.\n"
 "\n"
 "Credits: Sistheo Zeekom CrysaLEAD\n"
-""
 msgstr ""
 
 #. module: l10n_fr
@@ -473,7 +480,9 @@ msgstr ""
 
 #. module: l10n_fr
 #: rml:l10n.fr.cdr:0
-msgid "Reprises sur provisions, dépréciations (et amortissements) et transferts de charges"
+msgid ""
+"Reprises sur provisions, dépréciations (et amortissements) et transferts de "
+"charges"
 msgstr ""
 
 #. module: l10n_fr
@@ -608,7 +617,10 @@ msgstr ""
 
 #. module: l10n_fr
 #: rml:l10n.fr.bilan:0
-msgid "Attention, pour que votre bilan soit correct, vous devez solder les comptes 120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
+msgid ""
+"Attention, pour que votre bilan soit correct, vous devez solder les comptes "
+"120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à "
+"nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
 msgstr ""
 
 #. module: l10n_fr
@@ -782,8 +794,11 @@ msgstr ""
 
 #. module: l10n_fr
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,definition:0
@@ -1033,4 +1048,3 @@ msgstr ""
 #: rml:l10n.fr.bilan:0
 msgid "Dettes fiscales et sociales"
 msgstr ""
-
diff --git a/addons/l10n_lu/i18n/fr_FR.po b/addons/l10n_lu/i18n/fr_FR.po
index 3945b720b7a..5182d06d689 100644
--- a/addons/l10n_lu/i18n/fr_FR.po
+++ b/addons/l10n_lu/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:47+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_lu
 #: wizard_view:l10n_lu.tax.report.wizard,init:0
@@ -47,8 +48,14 @@ msgstr "Liquidités"
 
 #. module: l10n_lu
 #: model:ir.actions.todo,note:l10n_lu.config_call_account_template
-msgid "Generate Chart of Accounts from a Chart Template. You will be asked to select the company, the chart template, the no. of digits to generate the code for your accounts and Bank account, currency to create Journals. Thus,the pure copy of chart Template is generated.\n"
-"This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template."
+msgid ""
+"Generate Chart of Accounts from a Chart Template. You will be asked to "
+"select the company, the chart template, the no. of digits to generate the "
+"code for your accounts and Bank account, currency to create Journals. "
+"Thus,the pure copy of chart Template is generated.\n"
+"This is the same wizard that runs from Financial "
+"Management/Configuration/Financial Accounting/Financial Accounts/Generate "
+"Chart of Accounts from a Chart Template."
 msgstr ""
 
 #. module: l10n_lu
@@ -116,4 +123,3 @@ msgstr ""
 #: model:account.account.type,name:l10n_lu.account_type_root
 msgid "View"
 msgstr "Vue"
-
diff --git a/addons/membership/i18n/fr_FR.po b/addons/membership/i18n/fr_FR.po
index 605c60f1382..c737ea78ca0 100644
--- a/addons/membership/i18n/fr_FR.po
+++ b/addons/membership/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:21+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:21+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 11:41+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:09+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
 #: model:process.transition,name:membership.process_transition_invoicetoassociate0
@@ -220,7 +221,9 @@ msgstr ""
 #. module: membership
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
-msgstr "Erreur: l'unité de vente doit appartenir à une catégorie différente que l'unité de mesure"
+msgstr ""
+"Erreur: l'unité de vente doit appartenir à une catégorie différente que "
+"l'unité de mesure"
 
 #. module: membership
 #: model:ir.ui.menu,name:membership.menu_membership_products
@@ -282,8 +285,11 @@ msgstr ""
 
 #. module: membership
 #: constraint:product.template:0
-msgid "Error: The default UOM and the purchase UOM must be in the same category."
-msgstr "Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent faire partie de la même catégorie"
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Erreur: l'unité de mesure par défaut et l'unité de mesure d'achat doivent "
+"faire partie de la même catégorie"
 
 #. module: membership
 #: help:res.partner,membership_amount:0
@@ -440,8 +446,11 @@ msgstr "Ligne de Facture"
 
 #. module: membership
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: membership
 #: model:process.node,note:membership.process_node_waitingmember0
@@ -530,4 +539,3 @@ msgstr "Année"
 #: field:res.partner,membership_state:0
 msgid "Current membership state"
 msgstr "État de l'adhésion courante"
-
diff --git a/addons/mrp/i18n/fr_FR.po b/addons/mrp/i18n/fr_FR.po
index 0a0ebc5fb0f..c2f43880f60 100644
--- a/addons/mrp/i18n/fr_FR.po
+++ b/addons/mrp/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-05 13:59+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-05 14:12+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -57,7 +57,7 @@ msgstr "Révision"
 #: model:ir.actions.wizard,name:mrp.wiz_mrp_proc2
 #: model:ir.ui.menu,name:mrp.menu_wiz_mrp_proc2
 msgid "Compute Stock Minimum Rules Only"
-msgstr "Calculer Uniquement les Règles de Stock Minimum"
+msgstr ""
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_procurement_action5
@@ -94,7 +94,7 @@ msgstr "Liste des Colisages"
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stock0
 msgid "Stockable Stock"
-msgstr "Stock Stoquable"
+msgstr ""
 
 #. module: mrp
 #: code:addons/mrp/wizard/wizard_change_production_qty.py:0
@@ -178,7 +178,7 @@ msgstr "Produit & Localisation"
 #. module: mrp
 #: view:res.company:0
 msgid "MRP & Logistic Scheduler"
-msgstr "Plannificateur MRP & Logistique"
+msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,capacity_per_cycle:0
@@ -216,7 +216,7 @@ msgstr "Produits consommés"
 #. module: mrp
 #: field:mrp.workcenter,costs_cycle_account_id:0
 msgid "Cycle Account"
-msgstr "Compte Cyclique"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.workcenter:0
diff --git a/addons/mrp/schedulers.py b/addons/mrp/schedulers.py
index 7970794446d..22bca594c95 100644
--- a/addons/mrp/schedulers.py
+++ b/addons/mrp/schedulers.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution    
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -26,14 +26,16 @@ import pooler
 from mx import DateTime
 import time
 
+
 class mrp_procurement(osv.osv):
     _inherit = 'mrp.procurement'
+
     def _procure_confirm(self, cr, uid, ids=None, use_new_cursor=False, context=None):
         '''
         use_new_cursor: False or the dbname
         '''
         if not context:
-            context={}
+            context = {}
 
         if use_new_cursor:
             cr = pooler.get_db(use_new_cursor).cursor()
@@ -41,7 +43,7 @@ class mrp_procurement(osv.osv):
 
         procurement_obj = self.pool.get('mrp.procurement')
         if not ids:
-            ids=procurement_obj.search(cr,uid,[], order="date_planned")
+            ids = procurement_obj.search(cr, uid, [], order="date_planned")
         for id in ids:
             wf_service.trg_validate(uid, 'mrp.procurement', id, 'button_restart', cr)
         if use_new_cursor:
@@ -56,13 +58,13 @@ class mrp_procurement(osv.osv):
         report_except = 0
         report_later = 0
         while True:
-            cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by date_planned limit 500 offset %s', ('confirmed','make_to_order',offset))
-            ids = map(lambda x:x[0], cr.fetchall())
+            cr.execute('select id from mrp_procurement where state=%s and procure_method=%s order by date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
+            ids = map(lambda x: x[0], cr.fetchall())
             for proc in procurement_obj.browse(cr, uid, ids):
                 if (maxdate.strftime('%Y-%m-%d')>=proc.date_planned)  or (proc.procure_method=='make_to_order'):
                     wf_service.trg_validate(uid, 'mrp.procurement', proc.id, 'button_check', cr)
                 else:
-                    offset+=1
+                    offset += 1
                     report_later += 1
             for proc in procurement_obj.browse(cr, uid, ids):
                 if proc.state == 'exception':
@@ -80,20 +82,20 @@ class mrp_procurement(osv.osv):
         ids = []
         while True:
             report_ids = []
-            ids = self.pool.get('mrp.procurement').search(cr, uid, [('state','=','confirmed'),('procure_method','=','make_to_stock')], offset=offset)
+            ids = self.pool.get('mrp.procurement').search(cr, uid, [('state', '=', 'confirmed'), ('procure_method', '=', 'make_to_stock')], offset=offset)
             for proc in procurement_obj.browse(cr, uid, ids):
                 if ((maxdate).strftime('%Y-%m-%d') >= proc.date_planned) or (proc.procure_method=='make_to_order'):
                     wf_service.trg_validate(uid, 'mrp.procurement', proc.id, 'button_check', cr)
                     report_ids.append(proc.id)
                 else:
-                    report_later +=1
-                report_total +=1
+                    report_later += 1
+                report_total += 1
             for proc in procurement_obj.browse(cr, uid, report_ids):
                 if proc.state == 'exception':
                     report.append('PROC %d: from stock - %3.2f %-5s - %s' % \
                             (proc.id, proc.product_qty, proc.product_uom.name,
                                 proc.product_id.name,))
-                    report_except +=1
+                    report_except += 1
             if use_new_cursor:
                 cr.commit()
             offset += len(ids)
@@ -111,12 +113,12 @@ class mrp_procurement(osv.osv):
     Not run now procurement: %d
 
     Exceptions;
-    '''% (start_date,end_date,report_total, report_except,report_later)
+    '''% (start_date, end_date, report_total, report_except, report_later)
             summary += '\n'.join(report)
             request.create(cr, uid,
-                {'name' : "Procurement calculation report.",
-                    'act_from' : uid,
-                    'act_to' : uid,
+                {'name': "Procurement calculation report.",
+                    'act_from': uid,
+                    'act_to': uid,
                     'body': summary,
                 })
         if use_new_cursor:
@@ -124,9 +126,9 @@ class mrp_procurement(osv.osv):
             cr.close()
         return {}
 
-    def create_automatic_op(self,cr, uid, context=None):
+    def create_automatic_op(self, cr, uid, context=None):
         if not context:
-            context={}
+            context = {}
         product_obj = self.pool.get('product.product')
         proc_obj = self.pool.get('mrp.procurement')
         warehouse_obj = self.pool.get('stock.warehouse')
@@ -140,7 +142,7 @@ class mrp_procurement(osv.osv):
         for warehouse in warehouse_obj.browse(cr, uid, warehouse_ids, context=context):
             context['warehouse'] = warehouse
             for product in self.pool.get('product.product').browse(cr, uid, products_id, context=context):
-                if product.virtual_available>=0.0:
+                if product.virtual_available >= 0.0:
                     continue
 
                 newdate = DateTime.now()
@@ -169,7 +171,7 @@ class mrp_procurement(osv.osv):
         use_new_cursor: False or the dbname
         '''
         if not context:
-            context={}
+            context = {}
         if use_new_cursor:
             cr = pooler.get_db(use_new_cursor).cursor()
         orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
@@ -183,9 +185,9 @@ class mrp_procurement(osv.osv):
         if automatic:
             self.create_automatic_op(cr, uid, context=context)
         while ids:
-            ids=orderpoint_obj.search(cr,uid,[],offset=offset,limit=100)
+            ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
             for op in orderpoint_obj.browse(cr, uid, ids):
-                if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft','confirmed'):
+                if op.procurement_id and op.procurement_id.purchase_id and op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
                     continue
                 prods = location_obj._product_virtual_get(cr, uid,
                         op.location_id.id, [op.product_id.id],
@@ -193,8 +195,8 @@ class mrp_procurement(osv.osv):
                 if prods < op.product_min_qty:
                     qty = max(op.product_min_qty, op.product_max_qty)-prods
                     reste = qty % op.qty_multiple
-                    if reste>0:
-                        qty += op.qty_multiple-reste
+                    if reste > 0:
+                        qty += op.qty_multiple - reste
                     newdate = DateTime.now() + DateTime.RelativeDateTime(
                             days=op.product_id.seller_delay)
                     if op.product_id.supply_method == 'buy':
@@ -203,11 +205,11 @@ class mrp_procurement(osv.osv):
                         location_id = op.warehouse_id.lot_stock_id
                     else:
                         continue
-                    if qty<=0:
+                    if qty <= 0:
                         continue
                     if op.product_id.type not in ('consu'):
                         proc_id = procurement_obj.create(cr, uid, {
-                            'name': 'OP:'+str(op.id),
+                            'name': 'OP:' + str(op.id),
                             'date_planned': newdate.strftime('%Y-%m-%d'),
                             'product_id': op.product_id.id,
                             'product_qty': qty,
diff --git a/addons/mrp_jit/i18n/fr_FR.po b/addons/mrp_jit/i18n/fr_FR.po
index af07fdfdf18..aba3f826c9e 100644
--- a/addons/mrp_jit/i18n/fr_FR.po
+++ b/addons/mrp_jit/i18n/fr_FR.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-04-10 12:01+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_jit
 #: model:ir.module.module,shortdesc:mrp_jit.module_meta_information
 msgid "MRP JIT"
 msgstr ""
-
diff --git a/addons/mrp_operations/i18n/fr_FR.po b/addons/mrp_operations/i18n/fr_FR.po
index bbc86c249dd..9458fa4d05c 100644
--- a/addons/mrp_operations/i18n/fr_FR.po
+++ b/addons/mrp_operations/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-11 08:50+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-11 08:52+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/fr_FR.po b/addons/mrp_repair/i18n/fr_FR.po
index c7bdb41ffb7..88c4eb04a1d 100644
--- a/addons/mrp_repair/i18n/fr_FR.po
+++ b/addons/mrp_repair/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 06:17+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 06:40+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
diff --git a/addons/mrp_subproduct/i18n/fr_FR.po b/addons/mrp_subproduct/i18n/fr_FR.po
index a575c7ed406..7726fa67cbf 100644
--- a/addons/mrp_subproduct/i18n/fr_FR.po
+++ b/addons/mrp_subproduct/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:49+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_subproduct
 #: constraint:ir.ui.view:0
@@ -22,8 +23,11 @@ msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: mrp_subproduct
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: mrp_subproduct
 #: view:mrp.bom:0
@@ -84,4 +88,3 @@ msgstr ""
 #: model:ir.module.module,shortdesc:mrp_subproduct.module_meta_information
 msgid "MRP Sub Product"
 msgstr ""
-
diff --git a/addons/point_of_sale/i18n/fr_FR.po b/addons/point_of_sale/i18n/fr_FR.po
index 7fea213a29c..70ab9f29f4f 100644
--- a/addons/point_of_sale/i18n/fr_FR.po
+++ b/addons/point_of_sale/i18n/fr_FR.po
@@ -6,15 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-06-16 13:04:51+0000\n"
-"PO-Revision-Date: 2009-06-05 12:12+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-06-11 07:58+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: \n"
-"X-Launchpad-Export-Date: 2009-06-05 12:16+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: point_of_sale
@@ -41,7 +40,6 @@ msgstr "Transaction du Point de vente"
 
 #. module: point_of_sale
 #: wizard_view:pos.discount,init:0
-#: rml:pos.receipt:0
 msgid "Discount :"
 msgstr "Remise :"
 
@@ -92,11 +90,6 @@ msgid "No Pricelist !"
 msgstr "Pas de Liste de Prix !"
 
 #. module: point_of_sale
-#: help:pos.order,user_id:0
-msgid "This is the logged in user (not necessarily the salesman)."
-msgstr "C'est l'utilisateur connecté (pas necessairement le vendeur)."
-
-#. module: point_of_sale
 #: wizard_view:pos.sale.get,init:0
 msgid "Select an Open Sale Order"
 msgstr "Sélectionnez une Commande Ouverte"
@@ -128,12 +121,6 @@ msgid "Base"
 msgstr "Base"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#, python-format
-msgid "No Default Credit Account !"
-msgstr "Aucun Compte de Crédit par défaut !"
-
-#. module: point_of_sale
 #: wizard_view:pos.scan_product,init:0
 msgid "Scan product"
 msgstr "Scan de produit"
@@ -200,8 +187,6 @@ msgstr "Nombre d'Articles"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/report/pos_invoice.py:0
-#: code:addons/point_of_sale/wizard/wizard_pos_payment.last.py:0
-#: code:addons/point_of_sale/wizard/wizard_pos_payment.py:0
 #, python-format
 msgid "Please create an invoice for this sale."
 msgstr "Veuillez créer une facture pour cette vente."
@@ -239,23 +224,12 @@ msgid "Select default journals"
 msgstr "Sélectionnez le Journal par défaut"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.receipt:0
-msgid "Qty"
-msgstr "Qté"
-
-#. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "You have to define a Default Debit Account for your Financial Journals!\n"
 msgstr "Vous devez définir un Compte de Débit par défaut pour vos Journaux Financiers !\n"
 
 #. module: point_of_sale
-#: field:pos.order,user_id:0
-msgid "Logged in User"
-msgstr "Utilisateur connecté"
-
-#. module: point_of_sale
 #: rml:pos.details:0
 msgid "VAT(%)"
 msgstr "TVA(%)"
@@ -291,11 +265,6 @@ msgid "Partner"
 msgstr "Partenaire"
 
 #. module: point_of_sale
-#: help:pos.order,salesman_id:0
-msgid "This is the salesman actually making the order."
-msgstr "C'est le vendeur effectuant la commande."
-
-#. module: point_of_sale
 #: field:pos.order,payments:0
 msgid "Order Payments"
 msgstr "Paiements des commandes"
@@ -306,32 +275,9 @@ msgid "Date :"
 msgstr "Date :"
 
 #. module: point_of_sale
-#: view:pos.order:0
-msgid "Ma_ke Payment"
-msgstr "Effectuer le paiement"
-
-#. module: point_of_sale
-#: model:ir.module.module,description:point_of_sale.module_meta_information
-msgid "\n"
-"Main features :\n"
-" - Fast encoding of the sale.\n"
-" - Allow to choose one payment mode (the quick way) or to split the payment between several payment mode.\n"
-" - Computation of the amount of money to return.\n"
-" - Create and confirm picking list automatically.\n"
-" - Allow the user to create invoice automatically.\n"
-" - Allow to refund former sales.\n"
-"\n"
-"    "
-msgstr "\n"
-"Principales fonctionalités :\n"
-" - encodage rapide de la vente\n"
-" - permet de choisir le mode de paiement (procédé rapide) ou de scinder le paiement entre plusieurs modes de paiement\n"
-" - calcul du montant à retourner\n"
-" - crée et confirme les listes de colisage automatiquement\n"
-" - permet à l'utilisateur de créer la facture automatiquement\n"
-" - permet le remboursement des ventes passées\n"
-"\n"
-"    "
+#: rml:pos.receipt:0
+msgid "Disc :"
+msgstr "Rem :"
 
 #. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_confirm
@@ -345,6 +291,7 @@ msgid "POS Orders"
 msgstr "Commandes Point de Vente"
 
 #. module: point_of_sale
+#: rml:pos.invoice:0
 #: rml:pos.lines:0
 msgid "Disc. (%)"
 msgstr "Rem. (%)"
@@ -387,9 +334,10 @@ msgid "Order Lines"
 msgstr "Lignes de la commande"
 
 #. module: point_of_sale
-#: rml:pos.invoice:0
-msgid "Disc.(%)"
-msgstr "Rem.(%)"
+#: rml:pos.details:0
+#: rml:pos.receipt:0
+msgid "Qty"
+msgstr "Qté"
 
 #. module: point_of_sale
 #: model:ir.module.module,shortdesc:point_of_sale.module_meta_information
@@ -399,8 +347,6 @@ msgstr "Point de Vente"
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
 #: code:addons/point_of_sale/report/pos_invoice.py:0
-#: code:addons/point_of_sale/wizard/wizard_pos_payment.last.py:0
-#: code:addons/point_of_sale/wizard/wizard_pos_payment.py:0
 #, python-format
 msgid "Error !"
 msgstr "Erreur !"
@@ -421,6 +367,11 @@ msgid "PRO-FORMA"
 msgstr "PRO-FORMA"
 
 #. module: point_of_sale
+#: rml:pos.receipt:0
+msgid "Total :"
+msgstr "Total :"
+
+#. module: point_of_sale
 #: model:ir.ui.menu,name:point_of_sale.menu_point_rep
 msgid "Reporting"
 msgstr "Reporting"
@@ -436,11 +387,6 @@ msgid "Point of Sale journal configuration."
 msgstr "Configuration des Journaux utilisés par les Points de Vente."
 
 #. module: point_of_sale
-#: rml:pos.receipt:0
-msgid "Total :"
-msgstr "Total :"
-
-#. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "Create line failed !"
@@ -473,12 +419,6 @@ msgid "Configuration"
 msgstr "Configuration"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#, python-format
-msgid "Unable to create invoice (partner has no address)."
-msgstr "Impossible de créer la facture (le partenaire n'a pas d'adresse)."
-
-#. module: point_of_sale
 #: rml:pos.invoice:0
 #: rml:pos.lines:0
 #: field:pos.order.line,price_unit:0
@@ -496,12 +436,6 @@ msgid "POS Lines of the day"
 msgstr "Lignes du Point de Vente du Jour"
 
 #. module: point_of_sale
-#: code:addons/point_of_sale/pos.py:0
-#, python-format
-msgid "No Default Debit Account !"
-msgstr "Aucun Compte de Débit par défaut !"
-
-#. module: point_of_sale
 #: field:pos.order,nb_print:0
 msgid "Number of Print"
 msgstr "Nombre d'Impression"
@@ -569,7 +503,7 @@ msgid "Point of Sale"
 msgstr "Point de Vente"
 
 #. module: point_of_sale
-#: field:pos.order,salesman_id:0
+#: field:pos.order,user_id:0
 msgid "Salesman"
 msgstr "Vendeur"
 
@@ -595,15 +529,12 @@ msgid "Wizard default journals"
 msgstr "Assistant des journaux par défaut"
 
 #. module: point_of_sale
-#: rml:pos.details:0
-#: rml:pos.details_summary:0
-msgid "Total of the day"
-msgstr "Total du Jour"
+#: view:pos.order:0
+msgid "Ma_ke Payment"
+msgstr "Effectuer le paiement"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/wizard/wizard_pos_payment.last.py:0
-#: code:addons/point_of_sale/wizard/wizard_pos_payment.py:0
 #, python-format
 msgid "No order lines defined for this sale."
 msgstr "Aucune lignes de commande pour cette vente."
@@ -666,6 +597,11 @@ msgid "POS Order line"
 msgstr "Ligne de ticket"
 
 #. module: point_of_sale
+#: rml:pos.receipt:0
+msgid "."
+msgstr "."
+
+#. module: point_of_sale
 #: model:ir.actions.wizard,name:point_of_sale.pos_discount
 msgid "Discount"
 msgstr "Remise"
@@ -744,8 +680,6 @@ msgstr "Vous ne pouvez pas modifier cetee commande. Elle a déjà été payée"
 
 #. module: point_of_sale
 #: code:addons/point_of_sale/pos.py:0
-#: code:addons/point_of_sale/wizard/wizard_pos_payment.last.py:0
-#: code:addons/point_of_sale/wizard/wizard_pos_payment.py:0
 #, python-format
 msgid "Error"
 msgstr "Erreur"
@@ -872,7 +806,7 @@ msgstr "Lignes de commande"
 #: code:addons/point_of_sale/pos.py:0
 #, python-format
 msgid "You have to define a Default Credit Account for your Financial Journals!\n"
-msgstr "Vous devez définir un COmpte de Crédit par défaut pour vos Journaux Financiers !\n"
+msgstr "Vous devez définir un Compte de Crédit par défaut pour vos Journaux Financiers !\n"
 
 #. module: point_of_sale
 #: field:pos.order.line,order_id:0
@@ -887,8 +821,17 @@ msgstr "Ajouter un paiement :"
 
 #. module: point_of_sale
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
+
+#. module: point_of_sale
+#: rml:pos.details:0
+#: rml:pos.details_summary:0
+msgid "Total of the day"
+msgstr "Total du Jour"
 
 #. module: point_of_sale
 #: model:ir.model,name:point_of_sale.model_pos_payment
@@ -940,6 +883,11 @@ msgid "Invoicing"
 msgstr "Facturation"
 
 #. module: point_of_sale
+#: rml:pos.receipt:0
+msgid ":"
+msgstr ":"
+
+#. module: point_of_sale
 #: field:pos.config.journal,journal_id:0
 #: field:pos.order,sale_journal:0
 #: wizard_field:pos.payment,ask_pay,journal:0
@@ -1015,6 +963,11 @@ msgid "Date Ordered"
 msgstr "Date de Commande"
 
 #. module: point_of_sale
+#: rml:pos.receipt:0
+msgid "Ce bon est valide jusqu'au"
+msgstr "Ce bon est valide jusqu'au"
+
+#. module: point_of_sale
 #: view:pos.order:0
 msgid "Payments"
 msgstr "Paiements"
@@ -1075,6 +1028,11 @@ msgid "Actions"
 msgstr "Actions"
 
 #. module: point_of_sale
+#: help:pos.order,salesman_id:0
+msgid "This is the salesman actually making the order."
+msgstr "C'est le vendeur effectuant la commande."
+
+#. module: point_of_sale
 #: rml:pos.details:0
 #: rml:pos.details_summary:0
 msgid "Mode of Taxes"
@@ -1110,4 +1068,3 @@ msgstr "Total"
 #: rml:pos.receipt:0
 msgid "Price"
 msgstr "Prix"
-
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 68daab9c078..7c71436373d 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -304,11 +304,14 @@ class pos_order(osv.osv):
     def create_picking(self, cr, uid, ids, context={}):
         """Create a picking for each order and validate it."""
         picking_obj = self.pool.get('stock.picking')
-
+        partner_obj = self.pool.get('res.partner')
+        address_id = False
         orders = self.browse(cr, uid, ids, context)
         for order in orders:
             if not order.last_out_picking:
                 new = True
+                if order.partner_id.id:
+                    address_id = partner_obj.address_get(cr, uid, [order.partner_id.id], ['delivery'])['delivery']
                 picking_id = picking_obj.create(cr, uid, {
                     'origin': order.name,
                     'type': 'out',
@@ -318,7 +321,8 @@ class pos_order(osv.osv):
                     'invoice_state': 'none',
                     'auto_picking': True,
                     'pos_order': order.id,
-                    })
+                    'address_id' : address_id
+                    },context)
                 self.write(cr, uid, [order.id], {'last_out_picking': picking_id})
             else:
                 picking_id = order.last_out_picking.id
@@ -547,6 +551,8 @@ class pos_order(osv.osv):
         return inv_ids
 
     def create_account_move(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
         account_move_obj = self.pool.get('account.move')
         account_move_line_obj = self.pool.get('account.move.line')
         account_period_obj = self.pool.get('account.period')
@@ -632,6 +638,7 @@ class pos_order(osv.osv):
                     'period_id': period,
                     'tax_code_id': tax_code_id,
                     'tax_amount': tax_amount,
+                    'partner_id' : order.partner_id and order.partner_id.id or False,
                 }, context=context)
 
                 # For each remaining tax with a code, whe create a move line
@@ -657,6 +664,7 @@ class pos_order(osv.osv):
                         'period_id': period,
                         'tax_code_id': tax_code_id,
                         'tax_amount': tax_amount,
+                        'partner_id' : order.partner_id and order.partner_id.id or False,
                     }, context=context)
 
 
@@ -675,6 +683,7 @@ class pos_order(osv.osv):
                     'period_id': period,
                     'tax_code_id': key[tax_code_pos],
                     'tax_amount': amount,
+                    'partner_id' : order.partner_id and order.partner_id.id or False,
                 }, context=context)
 
             # counterpart
@@ -690,6 +699,7 @@ class pos_order(osv.osv):
                     or 0.0,
                 'journal_id': order.sale_journal.id,
                 'period_id': period,
+                'partner_id' : order.partner_id and order.partner_id.id or False,
             }, context=context))
 
 
@@ -701,7 +711,6 @@ class pos_order(osv.osv):
                     ' "%s" (id:%d)') % (order.sale_journal.name, order.sale_journal.id, ))
 
             for payment in order.payments:
-
                 if not payment.journal_id.default_debit_account_id:
                     raise osv.except_osv(_('No Default Debit Account !'),
                         _('You have to define a Default Debit Account for your Financial Journals!\n'))
@@ -737,6 +746,7 @@ class pos_order(osv.osv):
                     'debit': ((payment.amount>0) and payment.amount) or 0.0,
                     'journal_id': payment.journal_id.id,
                     'period_id': period,
+                    'partner_id' : order.partner_id and order.partner_id.id or False,
                 }, context=context)
                 to_reconcile.append(account_move_line_obj.create(cr, uid, {
                     'name': order.name,
@@ -748,6 +758,7 @@ class pos_order(osv.osv):
                     'debit': ((payment.amount<0) and -payment.amount) or 0.0,
                     'journal_id': payment.journal_id.id,
                     'period_id': period,
+                    'partner_id' : order.partner_id and order.partner_id.id or False,
                 }, context=context))
 
             account_move_obj.button_validate(cr, uid, [move_id, payment_move_id], context=context)
@@ -755,17 +766,23 @@ class pos_order(osv.osv):
         return True
 
     def action_paid(self, cr, uid, ids, context=None):
-        self.create_picking(cr, uid, ids, context={})
+        if context is None:
+            context = {}
+        self.create_picking(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'paid'})
         return True
 
     def action_cancel(self, cr, uid, ids, context=None):
-        self.cancel_order(cr, uid, ids, context={})
+        if context is None:
+            context = {}
+        self.cancel_order(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'cancel'})
         return True
 
     def action_done(self, cr, uid, ids, context=None):
-        self.create_account_move(cr, uid, ids, context={})
+        if context is None:
+            context = {}
+        self.create_account_move(cr, uid, ids, context=context)
         self.write(cr, uid, ids, {'state': 'done'})
         return True
 
@@ -876,7 +893,14 @@ class pos_order_line(osv.osv):
 
         price_line = float(qty)*float(price)
         return {'name': product_name, 'product_id': product_id[0], 'price': price, 'price_line': price_line ,'qty': qty }
-
+    
+    def unlink(self, cr, uid, ids, context={}):
+        """Allows to delete pos order lines in draft,cancel state"""
+        for rec in self.browse(cr, uid, ids, context=context):
+            if rec.order_id.state not in ['draft','cancel']:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete an order line which is %s !')%(rec.order_id.state,))
+        return super(pos_order_line, self).unlink(cr, uid, ids, context=context)
+    
 pos_order_line()
 
 
diff --git a/addons/process/i18n/fr_FR.po b/addons/process/i18n/fr_FR.po
index 8a37e9747d7..c2dbab3607d 100644
--- a/addons/process/i18n/fr_FR.po
+++ b/addons/process/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 11:58+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: process
 #: view:process.node:0
@@ -23,8 +24,11 @@ msgstr ""
 
 #. module: process
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: process
 #: constraint:ir.actions.act_window:0
@@ -299,4 +303,3 @@ msgstr "Transitions"
 #: selection:process.transition.action,state:0
 msgid "Object Method"
 msgstr "Méthode de l'objet"
-
diff --git a/addons/product/i18n/fr_FR.po b/addons/product/i18n/fr_FR.po
index f7936a77da6..a7a3fefd320 100644
--- a/addons/product/i18n/fr_FR.po
+++ b/addons/product/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-05 14:20+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-05 14:24+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -1674,13 +1674,11 @@ msgid ""
 "The coefficient for the formula:\n"
 "1 (base unit) = coeff (this unit). Rate = 1 / Factor."
 msgstr ""
-"Coefficient pour la formule:\n"
-"1 (unité de base) = coeff (cette unité). Taux = 1 / Facteur."
 
 #. module: product
 #: help:product.template,weight_net:0
 msgid "The net weight in Kg."
-msgstr "La masse nette en Kg."
+msgstr ""
 
 #. module: product
 #: model:product.template,name:product.product_product_tow1_product_template
@@ -1688,11 +1686,6 @@ msgid "ATX Mid-size Tower"
 msgstr "Tour ATX Moyenne"
 
 #. module: product
-#: model:ir.actions.act_window,name:product.product_pricelist_action
-#: model:ir.ui.menu,name:product.menu_product_pricelist_action
-#: field:product.pricelist,version_id:0
-
-#. module: product
 #: field:product.supplierinfo,delay:0
 msgid "Delivery Delay"
 msgstr "Délai de livraison"
@@ -1795,17 +1788,17 @@ msgstr "Étiquettes de produits"
 #. module: product
 #: help:product.template,volume:0
 msgid "The volume in m3."
-msgstr "Le volume en m3"
+msgstr ""
 
 #. module: product
 #: model:product.ul,name:product.product_ul_big_box
 msgid "Box 30x40x60"
-msgstr "Caisse 30x40x60"
+msgstr ""
 
 #. module: product
 #: model:product.uom,name:product.product_uom_kgm
 msgid "KGM"
-msgstr "KGM"
+msgstr ""
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/product.py b/addons/product/product.py
index 1937912a329..12201761466 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -383,7 +383,7 @@ class product_product(osv.osv):
                         uom.id, product.list_price, context['uom'])
             else:
                 res[product.id] = product.list_price
-            res[product.id] =  (res[product.id] or 0.0) * product.price_margin + product.price_extra
+            res[product.id] =  (res[product.id] or 0.0) * (product.price_margin or 1.0) + product.price_extra
         return res
 
     def _get_partner_code_name(self, cr, uid, ids, product_id, partner_id, context={}):
@@ -518,7 +518,7 @@ class product_product(osv.osv):
         for product in self.browse(cr, uid, ids, context=context):
             res[product.id] = product[ptype] or 0.0
             if ptype == 'list_price':
-                res[product.id] = (res[product.id] * product.price_margin) + \
+                res[product.id] = (res[product.id] * (product.price_margin or 1.0)) + \
                         product.price_extra
             if 'uom' in context:
                 uom = product.uos_id or product.uom_id
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 681b53a3088..a268f3f0eb1 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -535,8 +535,6 @@
                             <separator string="Base Prices" colspan="4"/>
                             <field name="standard_price"/>
                             <field name="list_price"/>
-                            <field name="price_margin" select="1"/>
-                            <field name="price_extra" select="1"/>
                             <field groups="base.group_extended" name="cost_method"/>
                             <newline/>
                             <field colspan="4" name="seller_ids" nolabel="1"/>
diff --git a/addons/product/report/product_pricelist.py b/addons/product/report/product_pricelist.py
index 9387a7cb33d..3e232f7413c 100644
--- a/addons/product/report/product_pricelist.py
+++ b/addons/product/report/product_pricelist.py
@@ -36,13 +36,28 @@ class product_pricelist(report_sxw.rml_parse):
             'get_currency': self._get_currency,
             'get_categories': self._get_categories,
             'get_price': self._get_price,
+            'get_titles': self._get_titles,
         })
 
+    def _get_titles(self,form):
+        lst = []
+        vals = {}
+        qtys = 1
+
+        for i in range(1,6):
+            if form['qty'+str(i)] > 0 and form['qty'+str(i)] not in vals.values():
+                vals['qty'+str(qtys)] = form['qty'+str(i)]
+                qtys += 1
+        lst.append(vals)
+        return lst
+
     def _set_quantity(self,form):
         for i in range(1,6):
             q = 'qty%d'%i
-            if form[q]:
+            if form[q] >0 and form[q] not in self.quantity:
                 self.quantity.append(form[q])
+#            else:
+#                self.quantity.append(0)
         return True
 
     def _get_pricelist(self, pricelist_id):
@@ -66,22 +81,25 @@ class product_pricelist(report_sxw.rml_parse):
             pro_ids.append(product.id)
             if product.categ_id.id not in cat_ids:
                 cat_ids.append(product.categ_id.id)
-        cats=pool.get('product.category').browse(self.cr,self.uid,cat_ids)
+        cats = pool.get('product.category').read(self.cr,self.uid,cat_ids,['name'])
         for cat in cats:
-            product_ids=pool.get('product.product').search(self.cr,self.uid,[('id','in',pro_ids),('categ_id','=',cat.id)])
+            product_ids=pool.get('product.product').search(self.cr,self.uid,[('id','in',pro_ids),('categ_id','=',cat['id'])])
             products = []
-            for product in pool.get('product.product').browse(self.cr,self.uid,product_ids):
+            for product in pool.get('product.product').read(self.cr,self.uid,product_ids,['name','code']):
                 val={
-                         'id':product.id,
-                         'name':product.name,
-                         'code':product.code
+                         'id':product['id'],
+                         'name':product['name'],
+                         'code':product['code']
                          }
                 i = 1
                 for qty in self.quantity:
-                    val['qty'+str(i)]=self._get_price(self.pricelist,product.id,qty)
-                    i += 1
+                    if qty == 0:
+                        val['qty'+str(i)] = ""
+                    else:
+                        val['qty'+str(i)]=self._get_price(self.pricelist,product['id'],qty)
+                        i += 1
                 products.append(val)
-            res.append({'name':cat.name,'products':products})
+            res.append({'name':cat['name'],'products':products})
         return res
 
     def _get_price(self,pricelist_id, product_id,qty):
diff --git a/addons/product/report/product_pricelist.rml b/addons/product/report/product_pricelist.rml
index 7bf31a4fb05..7ce4ca4e19d 100644
--- a/addons/product/report/product_pricelist.rml
+++ b/addons/product/report/product_pricelist.rml
@@ -2,7 +2,7 @@
 <document filename="test.pdf">
   <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -13,220 +13,222 @@
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
     </blockTableStyle>
     <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      
     </blockTableStyle>
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
-      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,-1"/>
+      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,0" stop="4,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="5,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="6,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="7,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="7,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="8,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="8,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="9,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="9,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,0" stop="9,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="10,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="10,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="10,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="11,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="11,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,0" stop="11,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="12,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="12,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,0" stop="12,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="13,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="13,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,0" stop="13,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="4,0" stop="14,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="4,0" stop="14,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,0" stop="14,-1"/>
+    <blockTableStyle id="Table_category">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+	  <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <lineStyle kind="GRID" colorName="black"/>
-      <blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <blockBackground colorName="#e6e6e6" start="4,0" stop="4,0"/>
-      <blockBackground colorName="#e6e6e6" start="5,0" stop="5,0"/>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="16.0" leading="20" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P4" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P5" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P6" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P7" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P8" fontName="Times-Roman" fontSize="8.0" leading="10"/>
-    <paraStyle name="P9" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P11" fontName="Times-Bold" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P12" fontName="Times-Bold" fontSize="8.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P13" fontName="Times-Roman" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P14" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P15" fontName="Times-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P16" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P17" fontName="Times-Roman" textColor="blue" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Standard" fontName="Times-Bold" fontSize="10"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="cat" fontName="Times-Bold" textColor="blue" fontSize="14.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="3.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Drawing" fontName="Helvetica" fontSize="10.0" leading="13" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Header" fontName="Helvetica"/>
+    <paraStyle name="Endnote" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica" fontSize="10.0" leading="13"/>
+    <paraStyle name="Addressee" fontName="Helvetica" spaceBefore="0.0" spaceAfter="3.0"/>
+    <paraStyle name="Signature" fontName="Helvetica"/>
+    <paraStyle name="Heading 8" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 7" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 6" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 5" fontName="Helvetica-Bold" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 4" fontName="Helvetica-BoldOblique" fontSize="85%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 1" fontName="Helvetica-Bold" fontSize="115%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 10" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="First line indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Hanging indent" rightIndent="0.0" leftIndent="28.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Salutation" fontName="Helvetica"/>
+    <paraStyle name="Text body indent" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="List Indent" rightIndent="0.0" leftIndent="142.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Marginalia" rightIndent="0.0" leftIndent="113.0" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
   </stylesheet>
   <story>
-    <para style="P8">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <para style="P8">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <para style="P8">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <para style="P8">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <para style="P8">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="535" style="Table1">
+    <blockTable colWidths="539.0" style="Table1">
       <tr>
         <td>
-          <para style="P2">Products Price List</para>
+          <para style="terp_header_Centre">Products Price List</para>
         </td>
       </tr>
-      <para style="P10">
-      <font color="white"> </font>
-    </para>
     </blockTable>
-    <para style="P7">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="143.0,392.0" style="Table2">
+    <blockTable colWidths="131.0,408.0" style="Table2">
       <tr>
         <td>
-          <para style="Standard">Price List Name:</para>
+          <para style="terp_default_9">Price List Name:</para>
         </td>
         <td>
-          <para style="Standard">[[ get_pricelist(data['form']['price_list']) ]]</para>
+          <para style="terp_default_9">[[ get_pricelist(data['form']['price_list']) ]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="Standard">Currency :</para>
+          <para style="terp_default_9">Currency :</para>
         </td>
         <td>
-          <para style="Standard">[[ get_currency ( data['form']['price_list']) ]]</para>
+          <para style="terp_default_9">[[ get_currency ( data['form']['price_list']) ]]</para>
         </td>
       </tr>
       <tr>
         <td>
-          <para style="Standard">Printing Date :</para>
+          <para style="terp_default_9">Printing Date :</para>
         </td>
         <td>
-          <para style="Standard">[[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</para>
+          <para style="terp_default_9">[[ formatLang(time.strftime('%Y-%m-%d'), date=True) ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P10">
+    <para style="P1">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="130.0,81.0,81.0,81.0,81.0,81.0" style="Table5">
+    <para style="P1">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="165.0,78.0,74.0,73.0,72.0,76.0" style="Table7">
       <tr>
         <td>
-          <para style="P6">Description</para>
+          <para style="terp_tblheader_Details">Description</para>
+          <para style="terp_default_8">[[repeatIn(get_titles(data['form']), 'k')]]</para>
         </td>
         <td>
-          <para style="P5">[[str( data['form']['qty1']) ]] units</para>
+          <para style="terp_default_Right_9_Bold"><font>[[ k['qty1'] or removeParentNode('font') ]] units</font></para>
         </td>
         <td>
-          <para style="P6">[[ str(data['form']['qty2'] )]] units</para>
+          <para style="terp_default_Right_9_Bold"><font>[[ k['qty2'] or removeParentNode('font') ]] units</font></para>
         </td>
         <td>
-          <para style="P6">[[ str(data['form']['qty3']) ]] units</para>
+          <para style="terp_default_Right_9_Bold"><font>[[ k['qty3'] or removeParentNode('font') ]] units</font></para>
         </td>
         <td>
-          <para style="P6">[[ str(data['form']['qty4']) ]] units</para>
+          <para style="terp_default_Right_9_Bold"><font>[[ k['qty4'] or removeParentNode('font') ]] units</font></para>
         </td>
         <td>
-          <para style="P6">[[ str(data['form']['qty5'] ) ]] units</para>
+          <para style="terp_default_Right_9_Bold"><font>[[ k['qty5'] or removeParentNode('font') ]] units</font></para>
         </td>
       </tr>
     </blockTable>
     <section>
-    
-     <para style="cat">[[repeatIn(get_categories(objects,data['form']), 'c')]][[ c['name'] ]]</para>
-     <blockTable colWidths="130.0,81.0,81.0,81.0,81.0,81.0" style="Table3">
+      <para style="terp_default_1">[[repeatIn(get_categories(objects,data['form']), 'c')]]</para>
+      <blockTable colWidths="167.0,372.0" style="Table_category">
         <tr>
           <td>
-            <para style="Standard"><font>[[repeatIn(c['products'], 'p')]]</font>[[ p['code'] and '[' + p['code'] + '] ' or '' ]] [[ p['name'] ]]</para>
-          </td>
-          <td>
-            <para style="P7">[[p['qty1'] ]]</para>
-          </td>
-          <td>
-            <para style="P7">[[ p['qty2'] ]]</para>
+            <para style="terp_default_Bold_9">[[ c['name'] ]]</para>
           </td>
           <td>
-            <para style="P7">[[ p['qty3'] ]]</para>
-          </td>
-          <td>
-            <para style="P7">[[ p['qty4'] ]]</para>
-          </td>
-          <td>
-            <para style="P7">[[ p['qty5'] ]]</para>
+            <para style="terp_default_Bold_9">
+              <font color="white"> </font>
+            </para>
           </td>
         </tr>
-     </blockTable>
+      </blockTable>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
+      <section>
+        <para style="terp_default_8">[[repeatIn(c['products'], 'p')]]</para>
+        <blockTable colWidths="166.0,78.0,75.0,73.0,73.0,74.0" style="Table3">
+          <tr>
+            <td>
+              <para style="terp_default_9">[[ p['code'] and '[' + p['code'] + '] ' or '' ]] [[ p['name'] ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold"><font>[[ p['qty1'] or removeParentNode('font') ]]</font></para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold"><font>[[ p['qty2'] or removeParentNode('font') ]]</font></para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold"><font>[[ p['qty3'] or removeParentNode('font') ]]</font></para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold"><font>[[ p['qty4'] or removeParentNode('font') ]]</font></para>
+            </td>
+            <td>
+              <para style="terp_default_Right_9_Bold"><font>[[ p['qty5'] or removeParentNode('font') ]]</font></para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_default_1">
+          <font color="white"> </font>
+        </para>
+      </section>
+      <para style="terp_default_1">
+        <font color="white"> </font>
+      </para>
     </section>
-    
-    <para style="P1">
-      <font color="white"> </font>
-    </para>
   </story>
-</document>
-
+</document>
+\ No newline at end of file
diff --git a/addons/product_margin/i18n/fr_FR.po b/addons/product_margin/i18n/fr_FR.po
index e82bbd31209..38697421ffe 100644
--- a/addons/product_margin/i18n/fr_FR.po
+++ b/addons/product_margin/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:13+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:25+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_margin
 #: field:product.product,expected_margin_rate:0
@@ -27,8 +28,11 @@ msgstr ""
 
 #. module: product_margin
 #: help:product.product,sale_expected:0
-msgid "Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
-msgstr "Somme de la Multiplication du prix de Catalogue de Vente et de la quantité des Factures Clients"
+msgid ""
+"Sum of Multification of Sale Catalog price and quantity of Customer Invoices"
+msgstr ""
+"Somme de la Multiplication du prix de Catalogue de Vente et de la quantité "
+"des Factures Clients"
 
 #. module: product_margin
 #: wizard_field:product.margins,init,to_date:0
@@ -69,8 +73,11 @@ msgstr ""
 
 #. module: product_margin
 #: help:product.product,total_cost:0
-msgid "Sum of Multification of Invoice price and quantity of Supplier Invoices "
-msgstr "Somme de la Multiplication du prix de la Facture et de la quantité des Factures Fournisseurs "
+msgid ""
+"Sum of Multification of Invoice price and quantity of Supplier Invoices "
+msgstr ""
+"Somme de la Multiplication du prix de la Facture et de la quantité des "
+"Factures Fournisseurs "
 
 #. module: product_margin
 #: view:product.product:0
@@ -106,7 +113,9 @@ msgstr "Somme de la Quantité dans les Factures Fournisseurs"
 #. module: product_margin
 #: help:product.product,normal_cost:0
 msgid "Sum of Multification of Cost price and quantity of Supplier Invoices"
-msgstr "Somme de la Multiplication du Prix d'Achat et de la quantité des Factures Fournisseurs"
+msgstr ""
+"Somme de la Multiplication du Prix d'Achat et de la quantité des Factures "
+"Fournisseurs"
 
 #. module: product_margin
 #: view:product.product:0
@@ -153,8 +162,11 @@ msgstr "# Acheté"
 
 #. module: product_margin
 #: help:product.product,turnover:0
-msgid "Sum of Multification of Invoice price and quantity of Customer Invoices"
-msgstr "Somme de la Multiplication du prix Facturé et de la quantité des Factures Clients"
+msgid ""
+"Sum of Multification of Invoice price and quantity of Customer Invoices"
+msgstr ""
+"Somme de la Multiplication du prix Facturé et de la quantité des Factures "
+"Clients"
 
 #. module: product_margin
 #: help:product.product,expected_margin_rate:0
@@ -272,4 +284,3 @@ msgstr "Somme de la Quantité dans les Factures Clients"
 #: wizard_view:product.margins,init:0
 msgid "View Stock of Products"
 msgstr "Voir le Stock des Produits"
-
diff --git a/addons/profile_accounting/i18n/fr_FR.po b/addons/profile_accounting/i18n/fr_FR.po
index 43fce780ea1..a3f8229a3fc 100644
--- a/addons/profile_accounting/i18n/fr_FR.po
+++ b/addons/profile_accounting/i18n/fr_FR.po
@@ -6,24 +6,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:53+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_accounting
 #: model:ir.actions.todo,note:profile_accounting.config_install_wizard
-msgid "Install more modules. A few modules are proposed according to the Account Profile you selected. You will be able to install them based on our requirements."
+msgid ""
+"Install more modules. A few modules are proposed according to the Account "
+"Profile you selected. You will be able to install them based on our "
+"requirements."
 msgstr ""
 
 #. module: profile_accounting
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: profile_accounting
 #: view:profile.accounting.config.install_modules_wizard:0
@@ -32,7 +39,11 @@ msgstr "Gestion des Services"
 
 #. module: profile_accounting
 #: help:profile.accounting.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
+msgid ""
+"The Document Management System of Open ERP allows you to store, browse, "
+"automatically index, search and preview all kind of documents (internal "
+"documents, printed reports, calendar system). It opens an FTP access for the "
+"users to easily browse association's document."
 msgstr ""
 
 #. module: profile_accounting
@@ -129,4 +140,3 @@ msgstr ""
 #: view:profile.accounting.config.install_modules_wizard:0
 msgid "Cancel"
 msgstr "Annuler"
-
diff --git a/addons/profile_association/i18n/fr_FR.po b/addons/profile_association/i18n/fr_FR.po
index 87e239eb873..ee296abb78e 100644
--- a/addons/profile_association/i18n/fr_FR.po
+++ b/addons/profile_association/i18n/fr_FR.po
@@ -6,19 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 11:42+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_association
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: profile_association
 #: view:profile.association.config.install_modules_wizard:0
@@ -27,12 +31,18 @@ msgstr ""
 
 #. module: profile_association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
 #. module: profile_association
 #: help:profile.association.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
+msgid ""
+"The Document Management System of Open ERP allows you to store, browse, "
+"automatically index, search and preview all kind of documents (internal "
+"documents, printed reports, calendar system). It opens an FTP access for the "
+"users to easily browse association's document."
 msgstr ""
 
 #. module: profile_association
@@ -118,16 +128,21 @@ msgstr ""
 
 #. module: profile_association
 #: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid "Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."
+msgid ""
+"Tracks the personal expenses process, from the employee expense encoding, to "
+"the reimbursement of the employee up to the reinvoicing to the final "
+"customer."
 msgstr ""
 
 #. module: profile_association
 #: model:ir.actions.todo,note:profile_association.config_install_module
-msgid "Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements."
+msgid ""
+"Install more modules. A few modules are proposed according to the "
+"association profile you selected. You will be able to install them based on "
+"our requirements."
 msgstr ""
 
 #. module: profile_association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Cancel"
 msgstr ""
-
diff --git a/addons/profile_auction/i18n/fr_FR.po b/addons/profile_auction/i18n/fr_FR.po
index 9617bc664e8..500baf27b21 100644
--- a/addons/profile_auction/i18n/fr_FR.po
+++ b/addons/profile_auction/i18n/fr_FR.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-04-10 14:07+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_auction
 #: model:ir.module.module,description:profile_auction.module_meta_information
 msgid "Profile for Auction house"
 msgstr ""
-
diff --git a/addons/profile_crm/i18n/fr_FR.po b/addons/profile_crm/i18n/fr_FR.po
index 741a9ea0bb7..ad0cb085d6c 100644
--- a/addons/profile_crm/i18n/fr_FR.po
+++ b/addons/profile_crm/i18n/fr_FR.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:01+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:37+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:08+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 13:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_crm
diff --git a/addons/profile_manufacturing/i18n/fr_FR.po b/addons/profile_manufacturing/i18n/fr_FR.po
index 4060ce3ef92..28c8c677a5e 100644
--- a/addons/profile_manufacturing/i18n/fr_FR.po
+++ b/addons/profile_manufacturing/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:30+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
@@ -27,8 +28,11 @@ msgstr ""
 
 #. module: profile_manufacturing
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: profile_manufacturing
 #: field:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
@@ -52,12 +56,19 @@ msgstr ""
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
+msgid ""
+"The Document Management System of Open ERP allows you to store, browse, "
+"automatically index, search and preview all kind of documents (internal "
+"documents, printed reports, calendar system). It opens an FTP access for the "
+"users to easily browse association's document."
 msgstr ""
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_journal:0
-msgid "This module  allows you to manage your sales, invoicing and picking by journals. You can define journals for trucks, salesman, departments, invoicing date delivery period, etc."
+msgid ""
+"This module  allows you to manage your sales, invoicing and picking by "
+"journals. You can define journals for trucks, salesman, departments, "
+"invoicing date delivery period, etc."
 msgstr ""
 
 #. module: profile_manufacturing
@@ -73,12 +84,18 @@ msgstr ""
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_jit:0
-msgid "The JIT module allows you to not run the scheduler periodically. It's easier and faster for real time stock computation but, in counter-part, it manages less efficiently priorities in procurements."
+msgid ""
+"The JIT module allows you to not run the scheduler periodically. It's easier "
+"and faster for real time stock computation but, in counter-part, it manages "
+"less efficiently priorities in procurements."
 msgstr ""
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_operation:0
-msgid "This module allows you to not only manage by production order but also by work order/operation. You will be able to planify, analyse the cost, check times, ... on all operations of each manufacturing order"
+msgid ""
+"This module allows you to not only manage by production order but also by "
+"work order/operation. You will be able to planify, analyse the cost, check "
+"times, ... on all operations of each manufacturing order"
 msgstr ""
 
 #. module: profile_manufacturing
@@ -98,7 +115,9 @@ msgstr ""
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,mrp_repair:0
-msgid "Allow to manage product repairs. Handle the guarantee limit date and the invoicing of products and services."
+msgid ""
+"Allow to manage product repairs. Handle the guarantee limit date and the "
+"invoicing of products and services."
 msgstr ""
 
 #. module: profile_manufacturing
@@ -108,7 +127,10 @@ msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: profile_manufacturing
 #: model:ir.actions.todo,note:profile_manufacturing.config_install_module
-msgid "Install more modules. A few modules are proposed according to the manufacturing profile you selected. You will be able to install them based on our requirements."
+msgid ""
+"Install more modules. A few modules are proposed according to the "
+"manufacturing profile you selected. You will be able to install them based "
+"on our requirements."
 msgstr ""
 
 #. module: profile_manufacturing
@@ -128,7 +150,10 @@ msgstr ""
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,sale_crm:0
-msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."
+msgid ""
+"This installs the customer relationship features like: leads and "
+"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
+"on."
 msgstr ""
 
 #. module: profile_manufacturing
@@ -153,7 +178,11 @@ msgstr ""
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,point_of_sale:0
-msgid "This module allows you to manage a point of sale system. It offers a basic form for pos operations. You must also check our frontend point of sale for a perfect ergonomy with touchscreen materials and payment processing hardware."
+msgid ""
+"This module allows you to manage a point of sale system. It offers a basic "
+"form for pos operations. You must also check our frontend point of sale for "
+"a perfect ergonomy with touchscreen materials and payment processing "
+"hardware."
 msgstr ""
 
 #. module: profile_manufacturing
@@ -178,7 +207,12 @@ msgstr ""
 
 #. module: profile_manufacturing
 #: help:profile.manufacturing.config.install_modules_wizard,stock_location:0
-msgid "Allows you to manage an advanced logistic with different locations. You can define, by product: default locations, path of locations for different operations, etc. This module is often used for: localisation of products, managing a manufacturing chain, a quality control location, product that you rent, etc."
+msgid ""
+"Allows you to manage an advanced logistic with different locations. You can "
+"define, by product: default locations, path of locations for different "
+"operations, etc. This module is often used for: localisation of products, "
+"managing a manufacturing chain, a quality control location, product that you "
+"rent, etc."
 msgstr ""
 
 #. module: profile_manufacturing
@@ -195,4 +229,3 @@ msgstr ""
 #: field:profile.manufacturing.config.install_modules_wizard,stock_location:0
 msgid "Advanced Locations"
 msgstr ""
-
diff --git a/addons/profile_service/i18n/fr_FR.po b/addons/profile_service/i18n/fr_FR.po
index 578908915d9..09fc340b33f 100644
--- a/addons/profile_service/i18n/fr_FR.po
+++ b/addons/profile_service/i18n/fr_FR.po
@@ -6,19 +6,23 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:40+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:15+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: profile_service
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: profile_service
 #: view:profile.service.config.install_modules_wizard:0
@@ -32,22 +36,35 @@ msgstr "Gestion de la Relation"
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,project_mrp:0
-msgid "Manages quotation and sales orders. It allows you to automatically create and invoice tasks on fixes prices from quotations."
+msgid ""
+"Manages quotation and sales orders. It allows you to automatically create "
+"and invoice tasks on fixes prices from quotations."
 msgstr ""
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,project_gtd:0
-msgid "GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."
-msgstr "GTD est une méthodologie qui permet de vous organiser, vous et vos tâches. Ce module intégre pleinement les principes GTD avec la gestion de projets d'OpenERP."
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD est une méthodologie qui permet de vous organiser, vous et vos tâches. "
+"Ce module intégre pleinement les principes GTD avec la gestion de projets "
+"d'OpenERP."
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
+msgid ""
+"The Document Management System of Open ERP allows you to store, browse, "
+"automatically index, search and preview all kind of documents (internal "
+"documents, printed reports, calendar system). It opens an FTP access for the "
+"users to easily browse association's document."
 msgstr ""
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,account_budget_crossover:0
-msgid "Allows you to manage analytic budgets by journals. This module is used to manage budgets of your projects."
+msgid ""
+"Allows you to manage analytic budgets by journals. This module is used to "
+"manage budgets of your projects."
 msgstr ""
 
 #. module: profile_service
@@ -82,7 +99,10 @@ msgstr ""
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,hr_timesheet_invoice:0
-msgid "There are different invoicing methods in OpenERP: from sale orders, from shipping, ... Install this module if you plan to invoice your customers based on time spent on projects."
+msgid ""
+"There are different invoicing methods in OpenERP: from sale orders, from "
+"shipping, ... Install this module if you plan to invoice your customers "
+"based on time spent on projects."
 msgstr ""
 
 #. module: profile_service
@@ -102,8 +122,12 @@ msgstr ""
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,hr_holidays:0
-msgid "Tracks the full holidays management process, from the employee's request to the global planning."
-msgstr "Permet de suivre le processus entier de gestion des congés, de la demande de l'employé à la plannification globale."
+msgid ""
+"Tracks the full holidays management process, from the employee's request to "
+"the global planning."
+msgstr ""
+"Permet de suivre le processus entier de gestion des congés, de la demande de "
+"l'employé à la plannification globale."
 
 #. module: profile_service
 #: constraint:ir.ui.view:0
@@ -112,8 +136,13 @@ msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,scrum:0
-msgid "Scrum is an 'agile development methodology', mainly used in IT projects. It helps you to manage teams, long term roadmaps, sprints, and so on."
-msgstr "SCRUM est une méthode de développement agile, principalement utilisée dans les projets IT. Il vous aide à gérer les équipes, les feuilles de route, les sprints de développement, etc, ..."
+msgid ""
+"Scrum is an 'agile development methodology', mainly used in IT projects. It "
+"helps you to manage teams, long term roadmaps, sprints, and so on."
+msgstr ""
+"SCRUM est une méthode de développement agile, principalement utilisée dans "
+"les projets IT. Il vous aide à gérer les équipes, les feuilles de route, les "
+"sprints de développement, etc, ..."
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,portal:0
@@ -132,7 +161,10 @@ msgstr "Gestion des Congés"
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,crm_configuration:0
-msgid "This installs the customer relationship features like: leads and opportunities tracking, shared calendar, jobs tracking, bug tracker, and so on."
+msgid ""
+"This installs the customer relationship features like: leads and "
+"opportunities tracking, shared calendar, jobs tracking, bug tracker, and so "
+"on."
 msgstr ""
 
 #. module: profile_service
@@ -157,8 +189,12 @@ msgstr "Installer Module Supplémentaire"
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,project_timesheet:0
-msgid "Timesheets allows you to track time and costs spent on different projects, represented by analytic accounts."
-msgstr "Les feuilles de présence vous permettent de suivre le temps et les coûts dépensés sur les différents projets, représentés par des comptes analytiques."
+msgid ""
+"Timesheets allows you to track time and costs spent on different projects, "
+"represented by analytic accounts."
+msgstr ""
+"Les feuilles de présence vous permettent de suivre le temps et les coûts "
+"dépensés sur les différents projets, représentés par des comptes analytiques."
 
 #. module: profile_service
 #: field:profile.service.config.install_modules_wizard,wiki:0
@@ -182,12 +218,17 @@ msgstr ""
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,wiki:0
-msgid "An integrated wiki content management system. This is really usefull to manage FAQ, quality manuals, etc."
+msgid ""
+"An integrated wiki content management system. This is really usefull to "
+"manage FAQ, quality manuals, etc."
 msgstr ""
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,hr_expense:0
-msgid "Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."
+msgid ""
+"Tracks the personal expenses process, from the employee expense encoding, to "
+"the reimbursement of the employee up to the reinvoicing to the final "
+"customer."
 msgstr ""
 
 #. module: profile_service
@@ -212,6 +253,9 @@ msgstr "Annuler"
 
 #. module: profile_service
 #: help:profile.service.config.install_modules_wizard,base_contact:0
-msgid "Allows you to manage partners (enterprises), addresses of partners and contacts of these partners (employee/people). Install this if you plan to manage your relationships with partners and contacts, with contacts having different jobs in different companies."
+msgid ""
+"Allows you to manage partners (enterprises), addresses of partners and "
+"contacts of these partners (employee/people). Install this if you plan to "
+"manage your relationships with partners and contacts, with contacts having "
+"different jobs in different companies."
 msgstr ""
-
diff --git a/addons/project/i18n/fr_FR.po b/addons/project/i18n/fr_FR.po
index 730458cb757..b960b0e120d 100644
--- a/addons/project/i18n/fr_FR.po
+++ b/addons/project/i18n/fr_FR.po
@@ -6,14 +6,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:04+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:47+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:20+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:04+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project
@@ -63,9 +63,15 @@ msgid "Operation Not Permitted !"
 msgstr "Opération non permises !"
 
 #. module: project
-#: view:project.task:0
-msgid "Delegations"
-msgstr "Délégations"
+#: code:addons/project/wizard/task_delegate.py:0
+#, python-format
+msgid "CHECK: "
+msgstr "CONTROLE: "
+
+#. module: project
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
 
 #. module: project
 #: wizard_field:project.task.delegate,init,planned_hours_me:0
@@ -138,12 +144,9 @@ msgid "User you want to delegate this task to."
 msgstr "Utilisateur à qui vous voulez déléguer votre tâche."
 
 #. module: project
-#: help:project.project,members:0
-msgid ""
-"Project's member. Not used in any computation, just for information purpose."
+#: model:ir.actions.wizard,name:project.wizard_attachment_task
+msgid "All Attachments"
 msgstr ""
-"Membre du projet. Non utilisé dans aucun calcul, juste proposer à titre "
-"d'information"
 
 #. module: project
 #: model:process.transition.action,name:project.process_transition_action_openpendingtask0
@@ -188,6 +191,14 @@ msgid "Validate"
 msgstr "Valider"
 
 #. module: project
+#: model:ir.module.module,description:project.module_meta_information
+msgid ""
+"Project management module that track multi-level projects, tasks,\n"
+"works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
+"    "
+msgstr ""
+
+#. module: project
 #: model:ir.actions.act_window,name:project.action_view_task5_prog_prog
 #: model:ir.ui.menu,name:project.menu_tasks_yours_prog_prog
 msgid "My Tasks in Progress"
@@ -297,8 +308,6 @@ msgid ""
 "A new project has been created !\n"
 "We suggest you to close this one and work on this new project."
 msgstr ""
-"Un nouveau projet a été crée !\n"
-"Nous vous suggerons de fermer celui-ci et de travailler sur le nouveau."
 
 #. module: project
 #: help:project.task,effective_hours:0
@@ -315,6 +324,11 @@ msgstr ""
 "tâche sera fermé proposant un message pour envoyer un mail au client."
 
 #. module: project
+#: help:project.task.delegate,init,new_task_description:0
+msgid "Reinclude the description of the task in the task of the user."
+msgstr ""
+
+#. module: project
 #: field:project.project,category_id:0
 msgid "Analytic Account"
 msgstr "Classif. de comptabilité"
@@ -364,14 +378,17 @@ msgid "Reset as Project"
 msgstr "Réinitialiser en projet"
 
 #. module: project
-#: selection:project.project,state:0
-msgid "Template"
-msgstr "Modèle"
+#: view:project.task:0
+msgid "Delegations"
+msgstr "Délégations"
 
 #. module: project
-#: wizard_button:project.task.close,mail_ask,mail_send:0
-msgid "Send Message"
-msgstr "Envoyer un message"
+#: help:project.project,members:0
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
+msgstr ""
+"Membre du projet. Non utilisé dans aucun calcul, juste proposer à titre "
+"d'information"
 
 #. module: project
 #: view:project.project:0
@@ -401,6 +418,11 @@ msgstr ""
 "Pourcentage des tâches fermés en accord avec le total des tâches à faire."
 
 #. module: project
+#: wizard_field:project.task.delegate,init,new_task_description:0
+msgid "New Task Description"
+msgstr "Description de la nouvelle tâche"
+
+#. module: project
 #: help:project.project,notes:0
 msgid "Internal description of the project."
 msgstr "Description interne du projet"
@@ -508,6 +530,11 @@ msgid "Estimated time to close this task by the delegated user."
 msgstr "Temps estimés pour fermer cette tâche par l'utilisateur délégué"
 
 #. module: project
+#: selection:project.project,state:0
+msgid "Template"
+msgstr "Modèle"
+
+#. module: project
 #: model:ir.ui.menu,name:project.menu_definitions
 #: view:res.company:0
 msgid "Configuration"
@@ -609,6 +636,12 @@ msgstr ""
 "de Gantt"
 
 #. module: project
+#: code:addons/project/project.py:0
+#, python-format
+msgid "Task '%s' set in progress"
+msgstr "Tâche '%s' mise en cours"
+
+#. module: project
 #: view:project.project:0
 msgid "Project's members"
 msgstr "Membres du projet"
@@ -635,6 +668,12 @@ msgid "Status: %(state)s"
 msgstr "Statut: %(state)s"
 
 #. module: project
+#: code:addons/project/project.py:0
+#, python-format
+msgid "Task '%s' cancelled"
+msgstr "Tâche '%s' annullée"
+
+#. module: project
 #: view:project.task:0
 msgid "Planned"
 msgstr "Planifié"
@@ -723,7 +762,12 @@ msgstr "Unité de temps du projet"
 #: field:project.project,complete_name:0
 #: field:project.project,name:0
 msgid "Project Name"
-msgstr "Nom du projet"
+msgstr "Nom du groupe"
+
+#. module: project
+#: wizard_button:project.task.close,mail_ask,mail_send:0
+msgid "Send Message"
+msgstr "Envoyer un message"
 
 #. module: project
 #: field:project.project,total_hours:0
@@ -833,6 +877,11 @@ msgid "Delegate this task to a user"
 msgstr "Délégué cette tâche à un utilisateur"
 
 #. module: project
+#: field:project.task,delegated_user_id:0
+msgid "Delegated To"
+msgstr "Déléguer à"
+
+#. module: project
 #: field:project.task,date_close:0
 msgid "Date Closed"
 msgstr "Date fin"
@@ -857,6 +906,13 @@ msgid "Sum of spent hours of all tasks related to this project."
 msgstr "Somme des heures passés de toutes les tâches reliés à ce projet"
 
 #. module: project
+#: help:project.task,project_id:0
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
+msgstr ""
+
+#. module: project
 #: help:project.project,planned_hours:0
 msgid "Sum of planned hours of all tasks related to this project."
 msgstr "Sommes des tâches planifiés de toutes les tâches relier à ce projet."
@@ -893,6 +949,14 @@ msgid "Date Start: %(date_start)s"
 msgstr "Date de début: %(date_start)s"
 
 #. module: project
+#: help:project.project,category_id:0
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
+msgstr ""
+
+#. module: project
 #: view:project.project:0
 #: selection:project.project,state:0
 #: view:project.task:0
@@ -1033,6 +1097,13 @@ msgid "Running"
 msgstr "En cours"
 
 #. module: project
+#: help:project.project,parent_id:0
+msgid ""
+"If you have [?] in the name, it means there are no analytic account linked "
+"to project."
+msgstr ""
+
+#. module: project
 #: model:ir.actions.wizard,name:project.wizard_delegate_task
 msgid "Delegate Task"
 msgstr "Délégué Tâche"
@@ -1057,6 +1128,12 @@ msgid "New Feature"
 msgstr "Nouvelle fonctionnalité"
 
 #. module: project
+#: code:addons/project/project.py:0
+#, python-format
+msgid "Task '%s' closed"
+msgstr "Tâche '%s' clôturée"
+
+#. module: project
 #: model:process.node,note:project.process_node_opentask0
 msgid "Encode your working hours."
 msgstr "Encoder vos heures de travail"
@@ -1168,83 +1245,3 @@ msgstr "pied du mail"
 #: model:ir.ui.menu,name:project.menu_open_view_project_open
 msgid "Running projects"
 msgstr "Projets en cours"
-
-#. module: project
-#: code:addons/project/wizard/task_delegate.py:0
-#, python-format
-msgid "CHECK: "
-msgstr "CONTROLE: "
-
-#. module: project
-#: model:ir.module.module,description:project.module_meta_information
-msgid ""
-"Project management module that track multi-level projects, tasks,\n"
-"works done on tasks, eso. It is able to render planning, order tasks, eso.\n"
-"    "
-msgstr ""
-"Module de gestion de projets pour gérer des projets et tâches à multiples "
-"niveaux\n"
-"    "
-
-#. module: project
-#: help:project.task.delegate,init,new_task_description:0
-msgid "Reinclude the description of the task in the task of the user."
-msgstr "Réinclure la description de la tâche dans la tâche de l'utilisateur"
-
-#. module: project
-#: wizard_field:project.task.delegate,init,new_task_description:0
-msgid "New Task Description"
-msgstr "Description de la nouvelle tâche"
-
-#. module: project
-#: code:addons/project/project.py:0
-#, python-format
-msgid "Task '%s' set in progress"
-msgstr "Tâche '%s' mise en cours"
-
-#. module: project
-#: code:addons/project/project.py:0
-#, python-format
-msgid "Task '%s' cancelled"
-msgstr "Tâche '%s' annullée"
-
-#. module: project
-#: field:project.task,delegated_user_id:0
-msgid "Delegated To"
-msgstr "Déléguer à"
-
-#. module: project
-#: help:project.task,project_id:0
-msgid ""
-"If you have [?] in the project name, it means there are no analytic account "
-"linked to this project."
-msgstr ""
-"So vous avez [?] dans le nom du projet, cela signifie qu'il n'y a pas de "
-"compte analytique lié au projet."
-
-#. module: project
-#: help:project.project,category_id:0
-msgid ""
-"Link this project to an analytic account if you need financial management on "
-"projects. It enables you to connect projects with budgets, planning, cost "
-"and revenue analysis, timesheets on projects, etc."
-msgstr ""
-"Associe ce projet à un compte analytique si vous avez besoin de la gestion "
-"financière des projets. Il vous permet de relier des projets aux budgets, la "
-"planification, l'analyse des coûts et des revenus, des feuilles de temps sur "
-"des projets, etc."
-
-#. module: project
-#: help:project.project,parent_id:0
-msgid ""
-"If you have [?] in the name, it means there are no analytic account linked "
-"to project."
-msgstr ""
-"So vous avez [?] dans le nom, cela signifie qu'il n'y a pas de compte "
-"analytique lié au projet."
-
-#. module: project
-#: code:addons/project/project.py:0
-#, python-format
-msgid "Task '%s' closed"
-msgstr "Tâche '%s' clôturée"
diff --git a/addons/project_gtd/i18n/fr_FR.po b/addons/project_gtd/i18n/fr_FR.po
index 7efed3d553e..03c046f2380 100644
--- a/addons/project_gtd/i18n/fr_FR.po
+++ b/addons/project_gtd/i18n/fr_FR.po
@@ -6,25 +6,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:37+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:21+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_gtd
-#: code:addons/project_gtd/wizard/project_gtd_daily.py:0
+#: code:addons/project_gtd/project_gtd.py:0
 #, python-format
-msgid "No timebox of the type \"%s\" defined !"
-msgstr ""
+msgid "Eff. Hours"
+msgstr "Heures Eff."
 
 #. module: project_gtd
-#: code:addons/project_gtd/project_gtd.py:0
+#: code:addons/project_gtd/wizard/project_gtd_daily.py:0
 #, python-format
-msgid "Eff. Hours"
+msgid "No timebox of the type \"%s\" defined !"
 msgstr ""
 
 #. module: project_gtd
@@ -34,8 +35,11 @@ msgstr "Colonnes visibles"
 
 #. module: project_gtd
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: project_gtd
 #: model:ir.model,name:project_gtd.model_project_gtd_timebox
@@ -334,4 +338,3 @@ msgstr "Heures planifiés"
 #: selection:project.gtd.timebox,type:0
 msgid "Weekly"
 msgstr "Hebdomadaire"
-
diff --git a/addons/project_mrp/i18n/fr_FR.po b/addons/project_mrp/i18n/fr_FR.po
index 33586254cf5..e9cb3a2bc6a 100644
--- a/addons/project_mrp/i18n/fr_FR.po
+++ b/addons/project_mrp/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:21+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:19+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_mrp
 #: model:process.node,note:project_mrp.process_node_procuretasktask0
@@ -29,7 +30,9 @@ msgstr "Tâche"
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_ordertask0
 msgid "If procure method is Make to order and supply method is produce"
-msgstr "Si la méthode de réapprovisionnement est sur fabriqué et que la méthode est sur produire"
+msgstr ""
+"Si la méthode de réapprovisionnement est sur fabriqué et que la méthode est "
+"sur produire"
 
 #. module: project_mrp
 #: model:process.transition,note:project_mrp.process_transition_procuretask0
@@ -80,4 +83,3 @@ msgstr "Crée une tâche"
 #: model:process.node,note:project_mrp.process_node_saleordertask0
 msgid "In case you sell services on sale order"
 msgstr "Dans ce cas vous vendez le service sur les commandes de ventes"
-
diff --git a/addons/project_retro_planning/i18n/fr_FR.po b/addons/project_retro_planning/i18n/fr_FR.po
index 41bad3207e5..0a20afb3314 100644
--- a/addons/project_retro_planning/i18n/fr_FR.po
+++ b/addons/project_retro_planning/i18n/fr_FR.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 12:58+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:35+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:00+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 13:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_retro_planning
diff --git a/addons/project_timesheet/i18n/fr_FR.po b/addons/project_timesheet/i18n/fr_FR.po
index f9f574a464c..17564b07702 100644
--- a/addons/project_timesheet/i18n/fr_FR.po
+++ b/addons/project_timesheet/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:51+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: project_timesheet
 #: field:project.task.work,hr_analytic_timesheet_id:0
@@ -34,13 +35,17 @@ msgstr "Pas d'employé définit pour cet utilisateur. Vous devez en créer un."
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
 #, python-format
-msgid "No product defined on the related employee.\nFill in the timesheet tab of the employee form."
+msgid ""
+"No product defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
 msgstr ""
 
 #. module: project_timesheet
 #: code:addons/project_timesheet/project_timesheet.py:0
 #, python-format
-msgid "No journal defined on the related employee.\nFill in the timesheet tab of the employee form."
+msgid ""
+"No journal defined on the related employee.\n"
+"Fill in the timesheet tab of the employee form."
 msgstr ""
 
 #. module: project_timesheet
@@ -48,4 +53,3 @@ msgstr ""
 #, python-format
 msgid "Bad Configuration !"
 msgstr ""
-
diff --git a/addons/purchase/i18n/fr_FR.po b/addons/purchase/i18n/fr_FR.po
index adaef6747d0..4eb7775677a 100644
--- a/addons/purchase/i18n/fr_FR.po
+++ b/addons/purchase/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-11 06:45+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-11 06:48+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -42,16 +42,6 @@ msgid "Validated By"
 msgstr "Validée par"
 
 #. module: purchase
-#: rml:purchase.order:0
-msgid "Request for Quotation N°"
-msgstr "Demande de Devis N °"
-	
-#. module: purchase
-#: rml:purchase.order:0
-msgid "Purchase Order Confirmation N°"
-msgstr "Confirmation de la commande d'achat N °"
-
-#. module: purchase
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Nom de Modèle non valide dans la définition de l'action"
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 68bec40c4bc..aae2b39f80e 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -275,7 +275,7 @@ class purchase_order(osv.osv):
                        'ref_partner_id': po.partner_id.id,
                        'ref_doc1': 'purchase.order,%d' % (po.id,),
                        })
-    def inv_line_create(self,a,ol):
+    def inv_line_create(self, cr, uid, a, ol):
         return (0, False, {
             'name': ol.name,
             'account_id': a,
@@ -313,7 +313,7 @@ class purchase_order(osv.osv):
                     a = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
                 fpos = o.fiscal_position or False
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
-                il.append(self.inv_line_create(a,ol))
+                il.append(self.inv_line_create(cr, uid, a, ol))
 
             a = o.partner_id.property_account_payable.id
             journal_ids = journal_obj.search(cr, uid, [('type', '=','purchase')], limit=1)
@@ -438,7 +438,7 @@ class purchase_order_line(osv.osv):
         'taxes_id': fields.many2many('account.tax', 'purchase_order_taxe', 'ord_id', 'tax_id', 'Taxes'),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_id': fields.many2one('product.product', 'Product', domain=[('purchase_ok','=',True)], change_default=True),
-        'move_id': fields.many2one('stock.move', 'Reservation', ondelete='set null'),
+        'move_ids': fields.one2many('stock.move', 'purchase_line_id', 'Reservation', readonly=True, ondelete='set null'),
         'move_dest_id': fields.many2one('stock.move', 'Reservation Destination', ondelete='set null'),
         'price_unit': fields.float('Unit Price', required=True, digits=(16, int(config['price_accuracy']))),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal'),
@@ -455,7 +455,7 @@ class purchase_order_line(osv.osv):
     def copy_data(self, cr, uid, id, default=None,context={}):
         if not default:
             default = {}
-        default.update({'state':'draft', 'move_id':False})
+        default.update({'state':'draft', 'move_id':[]})
         return super(purchase_order_line, self).copy_data(cr, uid, id, default, context)
 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom,
@@ -488,7 +488,6 @@ class purchase_order_line(osv.osv):
         qty = qty or 1.0
         seller_delay = 0
         for s in prod.seller_ids:
-            seller_delay = s.delay
             if s.name.id == partner_id:
                 seller_delay = s.delay
                 temp_qty = s.qty # supplier _qty assigned to temp
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 74117861d3d..df971a84b04 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -185,6 +185,10 @@
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
                         </page>
+                        <page string="History" groups="base.group_extended">
+                               <separator colspan="4" string="Stock Moves"/>
+                               <field colspan="4" name="move_ids" nolabel="1" widget="many2many"/>
+                        </page>                        
                     </notebook>
                 </form>
             </field>
diff --git a/addons/purchase_analytic_plans/i18n/fr_FR.po b/addons/purchase_analytic_plans/i18n/fr_FR.po
index fee96339579..32c0c31a16f 100644
--- a/addons/purchase_analytic_plans/i18n/fr_FR.po
+++ b/addons/purchase_analytic_plans/i18n/fr_FR.po
@@ -4,29 +4,29 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:39+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase_analytic_plans
 #: field:purchase.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Distribution Analytique"
 
 #. module: purchase_analytic_plans
 #: model:ir.module.module,shortdesc:purchase_analytic_plans.module_meta_information
 msgid "Purchase Analytic Distribution Management"
-msgstr ""
+msgstr "Gestion de la Distribution Analytiqes des Achats"
 
 #. module: purchase_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
-
diff --git a/addons/purchase_analytic_plans/purchase_analytic_plans.py b/addons/purchase_analytic_plans/purchase_analytic_plans.py
index 689abef8f20..1860b60a319 100644
--- a/addons/purchase_analytic_plans/purchase_analytic_plans.py
+++ b/addons/purchase_analytic_plans/purchase_analytic_plans.py
@@ -43,8 +43,8 @@ class purchase_order(osv.osv):
     _name='purchase.order'
     _inherit='purchase.order'
 
-    def inv_line_create(self,a,ol):
-        res=super(purchase_order,self).inv_line_create(a,ol)
+    def inv_line_create(self, cr, uid, a, ol):
+        res=super(purchase_order,self).inv_line_create(cr, uid, a, ol)
         res[2]['analytics_id']=ol.analytics_id.id
         return res
 
diff --git a/addons/report_account/i18n/fr_FR.po b/addons/report_account/i18n/fr_FR.po
index 501b18e4cf5..f466df5c586 100644
--- a/addons/report_account/i18n/fr_FR.po
+++ b/addons/report_account/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:19+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:16+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_account
 #: selection:report.invoice.created,type:0
@@ -22,8 +23,11 @@ msgstr ""
 
 #. module: report_account
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_account
 #: field:report.aged.receivable,name:0
@@ -237,4 +241,3 @@ msgstr ""
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
 msgstr ""
-
diff --git a/addons/report_analytic/i18n/fr_FR.po b/addons/report_analytic/i18n/fr_FR.po
index c0f2a477270..f430456f6d1 100644
--- a/addons/report_analytic/i18n/fr_FR.po
+++ b/addons/report_analytic/i18n/fr_FR.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:08+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:45+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:40+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:24+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic
@@ -42,7 +42,7 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: report_analytic
 #: field:report.analytic.account.close,name:0
 msgid "Analytic account"
-msgstr "Compte analytique"
+msgstr "Compte Analytique"
 
 #. module: report_analytic
 #: field:report.analytic.account.close,state:0
@@ -55,6 +55,16 @@ msgid "Deadline"
 msgstr "Echéance"
 
 #. module: report_analytic
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du model invalide pour la définition de l'action."
+
+#. module: report_analytic
+#: model:ir.module.module,shortdesc:report_analytic.module_meta_information
+msgid "Analytic Account Reporting"
+msgstr "Rapports des Comptes Analytiques"
+
+#. module: report_analytic
 #: field:report.analytic.account.close,partner_id:0
 msgid "Partner"
 msgstr "Partenaire"
@@ -75,8 +85,3 @@ msgstr "Comptes Analytiques Expirés"
 #: field:report.analytic.account.close,quantity:0
 msgid "Quantity"
 msgstr "Quantité"
-
-#. module: report_analytic
-#: model:ir.module.module,shortdesc:report_analytic.module_meta_information
-msgid "Analytic Account Reporting"
-msgstr "Rapports des Comptes Analytiques"
diff --git a/addons/report_analytic_line/i18n/fr_FR.po b/addons/report_analytic_line/i18n/fr_FR.po
index 25aaececf1b..ca9b6f5e9ff 100644
--- a/addons/report_analytic_line/i18n/fr_FR.po
+++ b/addons/report_analytic_line/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:32+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:11+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_line
 #: model:ir.actions.act_window,name:report_analytic_line.act_acc_analytic_acc_2_report_acc_analytic_line_to_invoice
@@ -32,8 +33,11 @@ msgstr "Produit"
 
 #. module: report_analytic_line
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_analytic_line
 #: model:ir.actions.act_window,name:report_analytic_line.action_account_analytic_line_to_invoice
@@ -86,4 +90,3 @@ msgstr "Unités"
 #: field:report.account.analytic.line.to.invoice,product_uom_id:0
 msgid "UoM"
 msgstr "UdM"
-
diff --git a/addons/report_analytic_planning/i18n/fr_FR.po b/addons/report_analytic_planning/i18n/fr_FR.po
index c1482ee9e38..5d53c2d0bff 100644
--- a/addons/report_analytic_planning/i18n/fr_FR.po
+++ b/addons/report_analytic_planning/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:52+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:07+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_analytic_planning
 #: rml:report_account_analytic.planning.print:0
@@ -62,8 +63,11 @@ msgstr ""
 
 #. module: report_analytic_planning
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_analytic_planning
 #: model:ir.actions.act_window,name:report_analytic_planning.action_account_analytic_planning_stat_form
@@ -340,4 +344,3 @@ msgstr "Ouvert"
 #: model:ir.ui.menu,name:report_analytic_planning.menu_report_account_analytic_planning_new
 msgid "New Planning"
 msgstr "Nouveau Planning"
-
diff --git a/addons/report_crm/i18n/fr_FR.po b/addons/report_crm/i18n/fr_FR.po
index 351843c02d9..2c480d79473 100644
--- a/addons/report_crm/i18n/fr_FR.po
+++ b/addons/report_crm/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:12+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:10+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_crm
 #: field:report.crm.case.categ,categ_id:0
@@ -113,8 +114,11 @@ msgstr "Tous les mois"
 
 #. module: report_crm
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_crm
 #: field:report.crm.case.categ,amount_revenue_prob:0
@@ -313,7 +317,8 @@ msgstr ""
 
 #. module: report_crm
 #: model:ir.module.module,description:report_crm.module_meta_information
-msgid "A module that adds new reports based on CRM cases.\n"
+msgid ""
+"A module that adds new reports based on CRM cases.\n"
 "    Case By section, Case By category"
 msgstr ""
 
@@ -328,4 +333,3 @@ msgstr "Ouvert"
 #: view:report.crm.case.service.dashboard:0
 msgid "Planned revenue"
 msgstr ""
-
diff --git a/addons/report_crm/security/ir.model.access.csv b/addons/report_crm/security/ir.model.access.csv
index 9756c47b2c7..12746e5d274 100644
--- a/addons/report_crm/security/ir.model.access.csv
+++ b/addons/report_crm/security/ir.model.access.csv
@@ -1,3 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_report_crm_case_user,report.crm.case.user,model_report_crm_case_user,crm.group_crm_manager,1,0,0,0
 access_report_crm_case_categ,report.crm.case.categ,model_report_crm_case_categ,crm.group_crm_manager,1,0,0,0
+access_repor_crm_case_section,report.crm.case.section,model_report_crm_case_section,crm.group_crm_manager,1,0,0,0
+access_report_crm_case_service_dashboard,report.crm.case.service.dashboard,model_report_crm_case_service_dashboard,crm.group_crm_manager,1,0,0,0
+
diff --git a/addons/report_document/i18n/fr_FR.po b/addons/report_document/i18n/fr_FR.po
index 377173224cc..06ac64f6a5b 100644
--- a/addons/report_document/i18n/fr_FR.po
+++ b/addons/report_document/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:28+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_document
 #: field:report.document.user,create_date:0
@@ -28,8 +29,11 @@ msgstr "Fichiers par Mois"
 
 #. module: report_document
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_document
 #: model:ir.actions.act_window,name:report_document.action_view_wall
@@ -243,4 +247,3 @@ msgstr "Temps de la Dernière Insertion"
 #: field:report.files.partner,partner:0
 msgid "Partner"
 msgstr "Partenaire"
-
diff --git a/addons/report_intrastat/i18n/fr_FR.po b/addons/report_intrastat/i18n/fr_FR.po
index 717cccdff7b..0ac058574c7 100644
--- a/addons/report_intrastat/i18n/fr_FR.po
+++ b/addons/report_intrastat/i18n/fr_FR.po
@@ -6,29 +6,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:48+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:14+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Canceled Invoice"
-msgstr "Facture Annulée"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Disc. (%)"
-msgstr "Disc. (%)"
+msgstr ""
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_tree
@@ -39,12 +43,12 @@ msgstr "Intrastat (ce mois)"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Invoice"
-msgstr "Facture Fournisseur"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Unit Price"
-msgstr "Prix Unitaire"
+msgstr ""
 
 #. module: report_intrastat
 #: constraint:ir.actions.act_window:0
@@ -54,7 +58,7 @@ msgstr ""
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Period"
-msgstr "Période"
+msgstr ""
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_90
@@ -69,22 +73,22 @@ msgstr "Import"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "VAT :"
-msgstr "TVA :"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Document"
-msgstr "Document"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "PRO-FORMA"
-msgstr "PRO-FORMA"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes:"
-msgstr "Taxes :"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -100,32 +104,32 @@ msgstr "Type"
 #. module: report_intrastat
 #: model:ir.actions.report.xml,name:report_intrastat.invoice_intrastat_id
 msgid "Invoice Intrastat"
-msgstr "Facture Intrastat"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice Date"
-msgstr "Date de Facturation"
+msgstr ""
 
 #. module: report_intrastat
 #: model:ir.module.module,shortdesc:report_intrastat.module_meta_information
 msgid "Intrastat Reporting - Reporting"
-msgstr "Rapport Intrastat - Rapport"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tel. :"
-msgstr "Tél. :"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Base"
-msgstr "Base"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Quantity"
-msgstr "Quantité"
+msgstr ""
 
 #. module: report_intrastat
 #: model:ir.ui.menu,name:report_intrastat.next_id_89
@@ -135,17 +139,17 @@ msgstr "Ce mois"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Partner Ref."
-msgstr "Réf. Partenaire"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (inclu. taxes):"
-msgstr "Total (taxes comprises) :"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Refund"
-msgstr "Remboursement"
+msgstr ""
 
 #. module: report_intrastat
 #: constraint:ir.ui.view:0
@@ -160,17 +164,17 @@ msgstr "Rapport Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Invoice"
-msgstr "Facture"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Taxes"
-msgstr "Taxes"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Amount"
-msgstr "Montant"
+msgstr ""
 
 #. module: report_intrastat
 #: view:report.intrastat:0
@@ -192,12 +196,12 @@ msgstr "Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Draft Invoice"
-msgstr "Facture Brouillon"
+msgstr ""
 
 #. module: report_intrastat
 #: field:report.intrastat,supply_units:0
 msgid "Supply Units"
-msgstr "Unités Fournies"
+msgstr ""
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -210,7 +214,7 @@ msgstr "Code Intrastat"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Origin"
-msgstr "Origine"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
@@ -226,7 +230,7 @@ msgstr "Membre Intrastat"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Tax"
-msgstr "Taxe"
+msgstr ""
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
@@ -246,22 +250,22 @@ msgstr "Export"
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Fax :"
-msgstr "Fax :"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Supplier Refund"
-msgstr "Remboursement Fournisseur"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Total (excl. taxes):"
-msgstr "Total (taxes non comprises):"
+msgstr ""
 
 #. module: report_intrastat
 #: rml:account.invoice.intrastat:0
 msgid "Price"
-msgstr "Prix"
+msgstr ""
 
 #. module: report_intrastat
 #: model:ir.actions.act_window,name:report_intrastat.action_report_intrastat_code_tree
@@ -269,4 +273,3 @@ msgstr "Prix"
 #: field:report.intrastat.code,name:0
 msgid "Intrastat Code"
 msgstr "Code Intrastat"
-
diff --git a/addons/report_mrp/i18n/fr_FR.po b/addons/report_mrp/i18n/fr_FR.po
index 2eb85e846b1..e49908c7991 100644
--- a/addons/report_mrp/i18n/fr_FR.po
+++ b/addons/report_mrp/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:56+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_mrp
 #: field:report.mrp.inout,date:0
@@ -33,8 +34,11 @@ msgstr "Reporting"
 
 #. module: report_mrp
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_mrp
 #: view:report.workcenter.load:0
@@ -98,4 +102,3 @@ msgstr "Variation de la valeur de stock"
 #: view:report.workcenter.load:0
 msgid "Workcenter load"
 msgstr "Charge du centre de travail"
-
diff --git a/addons/report_project/i18n/fr_FR.po b/addons/report_project/i18n/fr_FR.po
index 759dbae270c..6ea95e89075 100644
--- a/addons/report_project/i18n/fr_FR.po
+++ b/addons/report_project/i18n/fr_FR.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:07+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:51+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:32+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_project
@@ -23,16 +23,6 @@ msgid "Tasks finished by project (this month)"
 msgstr "Tâches terminées par projet (ce mois)"
 
 #. module: report_project
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: report_project
-#: view:report.project.task.user:0
-msgid "Tasks by Project and User"
-msgstr "Tâches par Projet et Utilisateur"
-
-#. module: report_project
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -41,33 +31,73 @@ msgstr ""
 "spéciaux !"
 
 #. module: report_project
-#: view:report.project.task.user:0
-msgid "Tasks by projects and users"
-msgstr "Tâches par projets et utilisateurs"
+#: model:ir.actions.act_window,name:report_project.action_project_task_user_tree
+#: model:ir.ui.menu,name:report_project.menu_project_task_user_tree
+msgid "Tasks Closed by Project and User"
+msgstr "Tâches Fermées par Projet et Utilisateur"
+
+#. module: report_project
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du model invalide pour la définition de l'action."
+
+#. module: report_project
+#: model:ir.actions.act_window,name:report_project.action_project_task_user_tree_month
+#: model:ir.ui.menu,name:report_project.menu_project_task_user_tree_month
+msgid "Tasks finished by project and user (this month)"
+msgstr "Tâches terminées par projet et par utilisateur (ce mois)"
+
+#. module: report_project
+#: field:report.project.task,hours_effective:0
+#: field:report.project.task.user,hours_effective:0
+msgid "Effective Hours"
+msgstr "Heures Effectives"
+
+#. module: report_project
+#: model:ir.model,name:report_project.model_report_project_task_user
+msgid "Tasks by user and project"
+msgstr "Tâches par utilisateur et par projet"
 
 #. module: report_project
 #: field:report.project.task,task_closed:0
 #: field:report.project.task.user,task_closed:0
 msgid "Task Closed"
-msgstr "Tâches clôturées"
+msgstr "Tâches Fermées"
 
 #. module: report_project
-#: model:ir.actions.act_window,name:report_project.action_project_task_user_tree
-#: model:ir.ui.menu,name:report_project.menu_project_task_user_tree
-msgid "Tasks Closed by Project and User"
-msgstr "Tâches clôturées par projet et utilisateur"
+#: view:report.project.task:0
+msgid "Tasks by Project"
+msgstr "Tâches par Projet"
 
 #. module: report_project
-#: field:report.project.task,hours_delay:0
-#: field:report.project.task.user,hours_delay:0
-msgid "Avg. Plan.-Eff."
-msgstr "Moy. Planif-Effect"
+#: model:ir.module.module,shortdesc:report_project.module_meta_information
+msgid "Sales Management - Reporting"
+msgstr "Gestion des ventes - Rapports"
 
 #. module: report_project
-#: field:report.project.task,name:0
-#: field:report.project.task.user,name:0
-msgid "Month"
-msgstr "Mois"
+#: field:report.project.task.user,user_id:0
+msgid "User"
+msgstr "Utilisateur"
+
+#. module: report_project
+#: view:report.project.task.user:0
+msgid "Tasks by Project and User"
+msgstr "Tâches par Projet et Utilisateur"
+
+#. module: report_project
+#: model:ir.ui.menu,name:report_project.next_id_63
+msgid "This Month"
+msgstr "Ce mois"
+
+#. module: report_project
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue"
+
+#. module: report_project
+#: view:report.project.task.user:0
+msgid "Tasks by projects and users"
+msgstr "Tâches par projets et utilisateurs"
 
 #. module: report_project
 #: field:report.project.task,project_id:0
@@ -82,56 +112,31 @@ msgid "Avg Closing Delay"
 msgstr "Delai moy de fermeture"
 
 #. module: report_project
-#: model:ir.model,name:report_project.model_report_project_task_user
-msgid "Tasks by user and project"
-msgstr "Tâches par utilisateur et par projet"
-
-#. module: report_project
 #: model:ir.model,name:report_project.model_report_project_task
 #: view:report.project.task:0
 msgid "Tasks by project"
 msgstr "Tâches par projet"
 
 #. module: report_project
-#: model:ir.actions.act_window,name:report_project.action_project_task_tree
-#: model:ir.ui.menu,name:report_project.menu_project_task_tree
-msgid "Tasks Closed by Project"
-msgstr "Tâches clôturées par projet"
-
-#. module: report_project
-#: model:ir.actions.act_window,name:report_project.action_project_task_user_tree_month
-#: model:ir.ui.menu,name:report_project.menu_project_task_user_tree_month
-msgid "Tasks finished by project and user (this month)"
-msgstr "Tâches terminées par projet et par utilisateur (ce mois)"
-
-#. module: report_project
-#: view:report.project.task:0
-msgid "Tasks by Project"
-msgstr "Tâches par projet"
+#: field:report.project.task,hours_delay:0
+#: field:report.project.task.user,hours_delay:0
+msgid "Avg. Plan.-Eff."
+msgstr "Moy. Planif-Effect"
 
 #. module: report_project
-#: model:ir.ui.menu,name:report_project.next_id_63
-msgid "This Month"
-msgstr "Ce mois"
+#: field:report.project.task,name:0
+#: field:report.project.task.user,name:0
+msgid "Month"
+msgstr "Mois"
 
 #. module: report_project
-#: field:report.project.task,hours_effective:0
-#: field:report.project.task.user,hours_effective:0
-msgid "Effective Hours"
-msgstr "Heures Effectives"
+#: model:ir.actions.act_window,name:report_project.action_project_task_tree
+#: model:ir.ui.menu,name:report_project.menu_project_task_tree
+msgid "Tasks Closed by Project"
+msgstr "Tâches Fermées par Projet"
 
 #. module: report_project
 #: field:report.project.task,hours_planned:0
 #: field:report.project.task.user,hours_planned:0
 msgid "Planned Hours"
-msgstr "Heures planifiées"
-
-#. module: report_project
-#: field:report.project.task.user,user_id:0
-msgid "User"
-msgstr "Utilisateur"
-
-#. module: report_project
-#: model:ir.module.module,shortdesc:report_project.module_meta_information
-msgid "Sales Management - Reporting"
-msgstr "Gestion des ventes - Rapports"
+msgstr "Heures planifiés"
diff --git a/addons/report_purchase/i18n/fr_FR.po b/addons/report_purchase/i18n/fr_FR.po
index e678faf5648..f173f696c7e 100644
--- a/addons/report_purchase/i18n/fr_FR.po
+++ b/addons/report_purchase/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 13:19+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:04+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_purchase
 #: field:report.purchase.order.category,price_average:0
@@ -57,8 +58,11 @@ msgstr "Tous les mois"
 
 #. module: report_purchase
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_purchase
 #: selection:report.purchase.order.category,state:0
@@ -128,8 +132,10 @@ msgstr "Ce mois"
 
 #. module: report_purchase
 #: model:ir.module.module,description:report_purchase.module_meta_information
-msgid "Module to add views like\n"
-"    Purchase By Product, Purchase By Category of Product, All Months, Current Month."
+msgid ""
+"Module to add views like\n"
+"    Purchase By Product, Purchase By Category of Product, All Months, "
+"Current Month."
 msgstr ""
 
 #. module: report_purchase
@@ -194,4 +200,3 @@ msgstr "Catégories"
 #: selection:report.purchase.order.product,state:0
 msgid "Cancel"
 msgstr "Annuler"
-
diff --git a/addons/report_sale/i18n/fr_FR.po b/addons/report_sale/i18n/fr_FR.po
index e1ca48e3983..980c6a7d6ae 100644
--- a/addons/report_sale/i18n/fr_FR.po
+++ b/addons/report_sale/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:47+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:19+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_sale
 #: selection:report.sale.order.created,state:0
@@ -78,8 +79,11 @@ msgstr "Tous les mois"
 
 #. module: report_sale
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_sale
 #: selection:report.sale.order.category,state:0
@@ -328,4 +332,3 @@ msgstr ""
 #: field:report.sale.order.created,amount_untaxed:0
 msgid "Untaxed Amount"
 msgstr ""
-
diff --git a/addons/report_sale/report_sale.py b/addons/report_sale/report_sale.py
index b26be94f816..c437522a3bb 100644
--- a/addons/report_sale/report_sale.py
+++ b/addons/report_sale/report_sale.py
@@ -60,6 +60,7 @@ class report_sale_order_product(osv.osv):
                 from sale_order s
                     right join sale_order_line l on (s.id=l.order_id)
                     left join product_uom u on (u.id=l.product_uom)
+                where l.product_uom_qty != 0
                 group by l.product_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
             )
         """)
@@ -105,6 +106,7 @@ class report_sale_order_category(osv.osv):
                     left join product_product p on (p.id=l.product_id)
                     left join product_template t on (t.id=p.product_tmpl_id)
                     left join product_uom u on (u.id=l.product_uom)
+                where l.product_uom_qty != 0    
                 group by t.categ_id, to_char(s.date_order, 'YYYY-MM-01'),s.state
             )
         """)
diff --git a/addons/report_task/i18n/fr_FR.po b/addons/report_task/i18n/fr_FR.po
index 3555e02a532..9629f634600 100644
--- a/addons/report_task/i18n/fr_FR.po
+++ b/addons/report_task/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:21+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:21+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-25 15:09+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:25+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_task
 #: selection:report.closed.task,state:0
@@ -29,8 +30,11 @@ msgstr ""
 
 #. module: report_task
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_task
 #: field:report.closed.task,remaining_hours:0
@@ -123,7 +127,8 @@ msgstr "Reporting"
 
 #. module: report_task
 #: model:ir.module.module,description:report_task.module_meta_information
-msgid "Gives statistics on tasks by user on projects to check the pipeline of users."
+msgid ""
+"Gives statistics on tasks by user on projects to check the pipeline of users."
 msgstr ""
 
 #. module: report_task
diff --git a/addons/report_timesheet/i18n/fr_FR.po b/addons/report_timesheet/i18n/fr_FR.po
index 688c1dfb93d..7bc151cc53d 100644
--- a/addons/report_timesheet/i18n/fr_FR.po
+++ b/addons/report_timesheet/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 11:49+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:19+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_timesheet
 #: model:ir.actions.act_window,name:report_timesheet.action_timesheet_account_date_stat_my
@@ -34,8 +35,11 @@ msgstr "Feuilles de Présence par Compte"
 
 #. module: report_timesheet
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: report_timesheet
 #: view:report_timesheet.account:0
@@ -243,7 +247,8 @@ msgstr "Feuille de présence journalière par compte"
 
 #. module: report_timesheet
 #: model:ir.module.module,description:report_timesheet.module_meta_information
-msgid "Module to add timesheet views like\n"
+msgid ""
+"Module to add timesheet views like\n"
 "    All Month, Timesheet By User, Timesheet Of Month, Timesheet By Account"
 msgstr ""
 
@@ -280,4 +285,3 @@ msgstr ""
 #: model:ir.ui.menu,name:report_timesheet.menu_report_timesheet_user
 msgid "Timesheet by user (this month)"
 msgstr "Feuille de présence par utilisateur (ce mois)"
-
diff --git a/addons/sale/i18n/fr_FR.po b/addons/sale/i18n/fr_FR.po
index 6a0267b0dd8..c1e02c9f7ce 100644
--- a/addons/sale/i18n/fr_FR.po
+++ b/addons/sale/i18n/fr_FR.po
@@ -4,16 +4,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-01-23 14:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:30+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:39+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 14:00+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:00+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -42,24 +42,33 @@ msgid "Allotment Partner"
 msgstr "Partenaire alloti"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Recreate Invoice"
-msgstr "Recréer la Facture"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom du Modèle non valide dans la définition de l'action."
 
 #. module: sale
 #: selection:sale.order,state:0
 msgid "Waiting Schedule"
-msgstr "Attente de planification"
+msgstr "Attente de programmation"
+
+#. module: sale
+#: help:sale.order,picking_policy:0
+msgid ""
+"If you don't have enough stock available to deliver all at once, do you "
+"accept partial shipments or not?"
+msgstr ""
+"Si vous n'avez pas suffisamment de stock pour livrer en une seule fois, "
+"acceptez vous les livraisons partielles ?"
 
 #. module: sale
 #: selection:sale.order.line,type:0
 msgid "from stock"
-msgstr "Depuis le stock"
+msgstr "En stock"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
 msgid "Steps To Deliver a Sale Order"
-msgstr "Étapes pour livrer une commande"
+msgstr "Étapes pour livrer une Commande de Vente"
 
 #. module: sale
 #: wizard_field:sale.advance_payment_inv,init,qtty:0
@@ -70,7 +79,7 @@ msgstr "Quantité"
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,create:0
 msgid "You invoice has been successfully created !"
-msgstr "Votre facture a été créée avec succès !"
+msgstr "Votre facture a été créé avec succès !"
 
 #. module: sale
 #: view:sale.order:0
@@ -82,7 +91,7 @@ msgstr "Déclaration automatique"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_line_tree3
 msgid "Uninvoiced and Delivered Lines"
-msgstr "Lignes livrées et non-facturées"
+msgstr "Lignes librées et non-facturées"
 
 #. module: sale
 #: view:sale.order:0
@@ -107,14 +116,13 @@ msgid "Delivery, from the warehouse to the customer."
 msgstr "Livraison, depuis l'entrepôt vers le client"
 
 #. module: sale
-#: field:sale.order,client_order_ref:0
-msgid "Customer Ref."
-msgstr "Réf. Client"
-
-#. module: sale
-#: model:ir.model,name:sale.model_sale_config_picking_policy
-msgid "sale.config.picking_policy"
-msgstr "sale.config.picking_policy"
+#: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
+msgid ""
+"This Configuration step use to set default picking policy when make sale "
+"order"
+msgstr ""
+"Cette configuration utilise la politique de colisage par défaut quand vous "
+"établissez une commande"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -124,12 +132,12 @@ msgstr "Valider"
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "After confirming order, Create the invoice."
-msgstr "Après la confirmation de commande, créer une facture."
+msgstr "Après confirmation de commande, créer une facture."
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
 msgid "Subtotal"
-msgstr "Sous-total"
+msgstr "Montant"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -137,14 +145,15 @@ msgid ""
 "Whenever confirm button is clicked, the draft state is moved to manual. that "
 "is, quotation is moved to  sale order."
 msgstr ""
-"Quand le bouton \"confirmer\" est pressé, l'état passe de brouillon à "
-"manuel, c'est à dire que le devis est transformé en commande."
+"Lorsque le bouton 'Confirmer' est cliqué, l'état 'Brouillon' est déplacé "
+"vers 'Manuel'. C'est-à-dire que le Devis est déplacé vers une Commande de "
+"Vente."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
 #: view:sale.order:0
 msgid "Cancel Order"
-msgstr "Annuler la commande"
+msgstr "Annuler"
 
 #. module: sale
 #: field:sale.order.line,move_ids:0
@@ -157,11 +166,6 @@ msgid "Manual Designation"
 msgstr "Désignation manuelle"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Invoice from the packings"
-msgstr "Facturation sur base des colisages"
-
-#. module: sale
 #: view:sale.order:0
 #: field:sale.order,note:0
 #: view:sale.order.line:0
@@ -193,17 +197,12 @@ msgstr "Total Net :"
 #. module: sale
 #: field:sale.order,order_policy:0
 msgid "Shipping Policy"
-msgstr "Politique d'expédition"
-
-#. module: sale
-#: field:sale.shop,name:0
-msgid "Shop name"
-msgstr "Nom du magasin"
+msgstr "Méthode d'expédition"
 
 #. module: sale
-#: rml:sale.order:0
-msgid "VAT"
-msgstr "TVA"
+#: selection:sale.order,state:0
+msgid "Shipping Exception"
+msgstr "Exception d'envoi"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -223,7 +222,7 @@ msgstr "Adresse de facturation"
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Outgoing Products"
-msgstr "Produits à expédier"
+msgstr "Produits à Livrer"
 
 #. module: sale
 #: view:sale.order:0
@@ -238,13 +237,14 @@ msgstr "Tout d'un coup"
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleprocurement0
 msgid "Procurement is created after confirmation of sale order."
-msgstr "Un approvisionnement est demandé après confirmation de commande."
+msgstr ""
+"Un approvisionnement est créé après confirmation de la commande de vente."
 
 #. module: sale
 #: field:sale.order,project_id:0
 #: field:sale.shop,project_id:0
 msgid "Analytic Account"
-msgstr "Compte analytique"
+msgstr "Centre profit/coût"
 
 #. module: sale
 #: rml:sale.order:0
@@ -254,7 +254,7 @@ msgstr "TVA :"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procure Method"
-msgstr "Méthode d'approvisionnement"
+msgstr "Méthode d'appro."
 
 #. module: sale
 #: view:sale.order:0
@@ -278,6 +278,11 @@ msgid "My sales order in progress"
 msgstr "Mes commandes en cours"
 
 #. module: sale
+#: field:sale.order.line,product_uos_qty:0
+msgid "Quantity (UoS)"
+msgstr "Quantité (UdV)"
+
+#. module: sale
 #: help:sale.order,invoice_quantity:0
 msgid ""
 "The sale order will automatically create the invoice proposition (draft "
@@ -285,11 +290,11 @@ msgid ""
 "choose if you invoice based on ordered or shipped quantities. If the product "
 "is a service, shipped quantities means hours spent on the associated tasks."
 msgstr ""
-"La commande créera automatiquement une proposition de facturation (facture "
-"brouillon). Les quantités commandées et expédiées peuvent ne pas être les "
-"mêmes. Vous devez choisir si vous facturez sur base des quantités commandées "
-"ou expédiées. Si le produit est un service, les quantités expédiées "
-"signifient les heures  passées aux tâches associées."
+"La commande créera une proposition de facturation (facture brouillon). Les "
+"quantités commandées et facturées peuvent ne pas être les mêmes. Vous devez "
+"choisir si vous facturez sur base des quantités commandées ou expédiées. Si "
+"le produit est un service, les quantitées expédiées signifies les heures "
+"dépensées aux tâches associées."
 
 #. module: sale
 #: code:addons/sale/wizard/make_invoice_advance.py:0
@@ -298,8 +303,8 @@ msgid ""
 "You cannot make an advance on a sale order that is defined as 'Automatic "
 "Invoice after delivery'."
 msgstr ""
-"Vous ne pouvez pas faire d'avance sur une commande définie en \"Facturation "
-"automatique après expédition\"."
+"Vous ne pouvez pas effectuer d'avance sur une commande de vente qui est "
+"définie comme 'Facture Automatique après Livraison'."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -309,7 +314,7 @@ msgstr "Confirmée"
 #. module: sale
 #: field:sale.shop,payment_default_id:0
 msgid "Default Payment Term"
-msgstr "Condition de règlement par défaut"
+msgstr "Paiement par défaut"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree_all
@@ -323,11 +328,29 @@ msgid "Confirm"
 msgstr "Confirmer"
 
 #. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You must first cancel all packing attached to this sale order."
+msgstr ""
+"Vous devez, avant tout, annuler tous les colisages attachés à cette commande "
+"de vente."
+
+#. module: sale
 #: field:sale.order,partner_shipping_id:0
 msgid "Shipping Address"
 msgstr "Adresse d'expédition"
 
 #. module: sale
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid ""
+"You have to select a customer in the sale form !\n"
+"Please set one customer before choosing a product."
+msgstr ""
+"Vous devez sélectionner une client dans le formulaire de vente !\n"
+"Veuillez sélectionner un client avant de choisir un produit."
+
+#. module: sale
 #: selection:sale.order,invoice_quantity:0
 msgid "Shipped Quantities"
 msgstr "Quantités livrées"
@@ -335,12 +358,18 @@ msgstr "Quantités livrées"
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Sales Orders"
-msgstr "Facturation basée sur les commandes"
+msgstr "Facture basée sur les commandes de ventes"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_shop
+#: view:sale.shop:0
+msgid "Sale Shop"
+msgstr "Point de vente"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
 msgid "Warehouse"
-msgstr "Entrepôt"
+msgstr "Entrepôt disponible"
 
 #. module: sale
 #: rml:sale.order:0
@@ -381,8 +410,9 @@ msgid ""
 "Packing list is created when 'Assign' is being clicked after confirming the "
 "sale order. This transaction moves the sale order to packing list."
 msgstr ""
-"La liste de colisages est créée quand on clique sur le bouton « Assigner » "
-"après confirmation de la commande client."
+"Une liste de colisage est créée lorsque le bouton 'Assigner' est cliqué "
+"après avoir confirmé la commande de vente. Cette transaction déplace la "
+"commande de vente vers la liste de colisage."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree8
@@ -401,8 +431,8 @@ msgid ""
 "When you select Shipping Ploicy = 'Automatic Invoice after delivery' , it "
 "will automatic create after delivery."
 msgstr ""
-"Quand vous sélectionnez la politique de livraison = 'Facturation automatique "
-"après livraison', il la créera automatiquement après le livraison."
+"Lorsque vous sélectionnez 'Politique de Livraison = Facture Automatique "
+"après Livraison', cela créera automatiquement une facture après livraison."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -447,7 +477,7 @@ msgstr "Quantités commandées"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sale Order Procurement"
-msgstr "Approvisionnement des commandes de ventes"
+msgstr "Approvisionnement de la Commande de Vente"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
@@ -471,20 +501,11 @@ msgid "Invalid action !"
 msgstr "Action invalide !"
 
 #. module: sale
-#: help:sale.order,state:0
-msgid ""
-"Gives the state of the quotation or sale order. The exception state is "
-"automatically set when a cancel operation occurs in the invoice validation "
-"(Invoice Exception) or in the packing list process (Shipping Exception). The "
-"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
-"for the scheduler to be on the date 'Date Ordered'."
-msgstr ""
-"Donne l'état du devis ou de la commande. L'état d'exception est "
-"automatiquement défini quand une opération d'annulation arrive dans la "
-"validation de facture (Exception de facture) ou dans le processus de "
-"colisage (Exception d'expédition). L'état 'En attente de planninfication' "
-"est défini lorsque la facture est confirmée mais en attente que le "
-"plannificateur soit à la date 'Date commandée'."
+#: selection:sale.order,state:0
+#: view:sale.order.line:0
+#: selection:sale.order.line,state:0
+msgid "Done"
+msgstr "Facturée"
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
@@ -498,11 +519,6 @@ msgid "Configuration"
 msgstr "Configuration"
 
 #. module: sale
-#: view:sale.order:0
-msgid "Total amount"
-msgstr "Montant total"
-
-#. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on Order After Delivery"
 msgstr "Facture basée sur la commande après livraison"
@@ -513,10 +529,14 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: sale
-#: model:ir.model,name:sale.model_sale_shop
-#: view:sale.shop:0
-msgid "Sale Shop"
-msgstr "Point de vente"
+#: field:sale.order,picking_ids:0
+msgid "Related Packing"
+msgstr "Colisage associé"
+
+#. module: sale
+#: field:sale.shop,payment_account_id:0
+msgid "Payment Accounts"
+msgstr "Comptes de Paiement"
 
 #. module: sale
 #: constraint:product.template:0
@@ -526,6 +546,16 @@ msgstr ""
 "l'unité de mesure"
 
 #. module: sale
+#: field:sale.order,client_order_ref:0
+msgid "Customer Ref"
+msgstr "Réf. Client"
+
+#. module: sale
+#: model:ir.model,name:sale.model_sale_config_picking_policy
+msgid "sale.config.picking_policy"
+msgstr "sale.config.picking_policy"
+
+#. module: sale
 #: view:sale.order:0
 msgid "Sales orders"
 msgstr "Commandes"
@@ -537,20 +567,14 @@ msgid "Procurement"
 msgstr "Approvisionnement"
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "Manual in progress"
-msgstr "Manuel en cours"
-
-#. module: sale
 #: view:sale.shop:0
-#: field:sale.shop,payment_account_id:0
 msgid "Payment accounts"
 msgstr "Compte de paiement"
 
 #. module: sale
-#: selection:sale.order,state:0
-msgid "Shipping Exception"
-msgstr "Exception d'envoi"
+#: wizard_button:sale.advance_payment_inv,create,end:0
+msgid "Close"
+msgstr "Fermer"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
@@ -571,52 +595,20 @@ msgid "All Quotations"
 msgstr "Toutes les propositions"
 
 #. module: sale
-#: field:sale.order.line,number_packages:0
-msgid "Number packages"
-msgstr "Nombre d'UL"
-
-#. module: sale
 #: field:sale.order.line,discount:0
 msgid "Discount (%)"
 msgstr "Escompte (%)"
 
 #. module: sale
-#: help:sale.order,order_policy:0
-msgid ""
-"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
-"  - The 'Pay before delivery' choice will first generate the invoice and "
-"then generate the packing order after the payment of this invoice.\n"
-"  - The 'Shipping & Manual Invoice' will create the packing order directly "
-"and wait for the user to manually click on the 'Invoice' button to generate "
-"the draft invoice.\n"
-"  - The 'Invoice on Order Ater Delivery' choice will generate the draft "
-"invoice based on sale order after all packing lists have been finished.\n"
-"  - The 'Invoice from the packings' choice is used to create an invoice "
-"during the packing process."
-msgstr ""
-"La Politique de livraison est utilisée pour synchroniser les opérations de "
-"facturation et de livraison. \n"
-"    - « Payer avant la livraison » génère d'abord la facture et ensuite le "
-"bon de livraison après le paiement de cette facture. \n"
-"    - « Livraison & Facture manuelle » crée directement le bon de livraison "
-"et crée une facture brouillon quand l'utilisateur clique sur le bouton « "
-"Facturer ». \n"
-"    - « Facture basée sur la commande après livraison»  crée une facture "
-"brouillon basée sur la commande du client à la fin de toutes les livraisons. "
-"\n"
-"    - « Facture sur base des livraisons » crée une facture pendant la "
-"livraison."
-
-#. module: sale
-#: selection:sale.order,state:0
-msgid "In progress"
-msgstr "En cours"
+#: model:process.node,note:sale.process_node_invoice0
+msgid "Draft customer invoice, to be reviewed by accountant."
+msgstr "Facture client en brouillon, doit être vérifier par le comptable"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree3
 #: model:ir.ui.menu,name:sale.menu_action_order_tree3
 msgid "Sales Order To Be Invoiced"
-msgstr "Commandes facturables"
+msgstr "Commandes de ventes Facturables"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
@@ -642,7 +634,7 @@ msgstr "Commande client"
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Packing Default Policy"
-msgstr "Politique de colisage par défaut"
+msgstr "Politique par défaut du Colisage"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
@@ -652,7 +644,7 @@ msgstr "Gerer le suivi des livraisons et des factures"
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
 msgid "Shipping Default Policy"
-msgstr "Politique de livraison par défaut"
+msgstr "Politique par défaut de la Livraison"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -676,6 +668,11 @@ msgid "Order Ref"
 msgstr "Réf. Commande"
 
 #. module: sale
+#: view:sale.order:0
+msgid "Recreate Invoice"
+msgstr "Recréer la Facture"
+
+#. module: sale
 #: field:sale.order,user_id:0
 msgid "Salesman"
 msgstr "Vendeur"
@@ -686,8 +683,8 @@ msgid ""
 "In sale order , procuerement for each line and it comes into the procurement "
 "order"
 msgstr ""
-"Dans les commandes de ventes, approvisionnement pour chaques lignes et "
-"provient des ordres d'approvisionnement"
+"Dans la commande de vente, approvisionnement pour chaque ligne et il viens "
+"dans la commande d'approvisionnement"
 
 #. module: sale
 #: rml:sale.order:0
@@ -703,7 +700,7 @@ msgstr "Facturer"
 #. module: sale
 #: model:ir.actions.wizard,name:sale.advance_payment
 msgid "Advance Invoice"
-msgstr "Accompte"
+msgstr "Facture Anticipée"
 
 #. module: sale
 #: field:sale.order,state:0
@@ -717,18 +714,42 @@ msgid "Uninvoiced Lines"
 msgstr "LIgnes non facturés"
 
 #. module: sale
-#: model:ir.actions.todo,note:sale.config_wizard_step_sale_picking_policy
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "No Customer Defined !"
+msgstr "Aucun Client défini !"
+
+#. module: sale
+#: help:sale.order,order_policy:0
 msgid ""
-"This Configuration step use to set default picking policy when make sale "
-"order"
+"The Shipping Policy is used to synchronise invoice and delivery operations.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the packing order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the packing order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice on Order Ater Delivery' choice will generate the draft "
+"invoice based on sale order after all packing lists have been finished.\n"
+"  - The 'Invoice from the packing' choice is used to create an invoice "
+"during the packing process."
 msgstr ""
-"Cette configuration utilise la politique de colisage par défaut quand vous "
-"établissez une commande"
+"La Politique de Livraison est utilisée pour synchroniser la facture et les "
+"opérations de livraison.\n"
+"  - le choix 'Payer avant la Livraison' créera directement une facture et "
+"créera la commande de colisage après le paiement de la facture\n"
+"  - 'Livraison & Facture Manuelle' créera la commande de colisage "
+"directement et attendra que l'utilisateur clique manuellement sur le bouton "
+"'Facture' pour générer la facture brouillon\n"
+"  - 'Facture sur Commande après Livraison' créera la facture brouillon basée "
+"sur la commande de vente après que toutes les listes de colisage soient "
+"terminées\n"
+"  - 'Facture basée sur le colisage' créera une facture pendant le processus "
+"de colisage"
 
 #. module: sale
 #: model:process.process,name:sale.process_process_salesprocess0
 msgid "Sales Process"
-msgstr "Processus de ventes"
+msgstr "Processus de Vente"
 
 #. module: sale
 #: wizard_view:sale.order.line.make_invoice,init:0
@@ -764,6 +785,11 @@ msgid "Sales in Exception"
 msgstr "Commandes en Exception"
 
 #. module: sale
+#: selection:sale.order.line,type:0
+msgid "on order"
+msgstr "Sur commande"
+
+#. module: sale
 #: selection:sale.order.line,state:0
 msgid "Draft"
 msgstr "Brouillon"
@@ -779,20 +805,20 @@ msgid "Procurement Corrected"
 msgstr "Approvisionnement corrigé"
 
 #. module: sale
+#: selection:sale.order,order_policy:0
+msgid "Shipping & Manual Invoice"
+msgstr "Livraison et facture manuelle"
+
+#. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Sale Procurement"
-msgstr "Approvisionnement des ventes"
+msgstr "Approvisionnement de la Vente"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "Configure Sale Order Logistic"
-msgstr "Configurer la logistique des commandes de ventes"
-
-#. module: sale
-#: field:sale.order.line,product_uos_qty:0
-msgid "Quantity (UOS)"
-msgstr "Quantité US"
+msgstr "Configurer la Logistique des Commandes de Vente"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -818,7 +844,7 @@ msgstr "Ventes de produit"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "invalid mode for test_state"
-msgstr "Mode invalide pour test_state"
+msgstr "Mode non valide pour test_state"
 
 #. module: sale
 #: rml:sale.order:0
@@ -836,18 +862,10 @@ msgid "One procurement for each product."
 msgstr "Un approvisionnement pour chaque produit"
 
 #. module: sale
-#: field:sale.order,picking_ids:0
-msgid "Related Packings"
-msgstr "Colisage en relation"
-
-#. module: sale
-#: help:sale.order,picking_policy:0
-msgid ""
-"If you don't have enough stock available to deliver all at once, do you "
-"accept partial shippings or not."
-msgstr ""
-"Si vous n'avez pas de stock suffisant pour tout livrer d'un coup, accèptez "
-"vous de faire une livraison partielle ou pas."
+#: model:ir.actions.act_window,name:sale.action_order_form
+#: model:ir.ui.menu,name:sale.menu_sale_order
+msgid "Sales Orders"
+msgstr "Commandes de Ventes"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -892,8 +910,9 @@ msgid ""
 "Invoice is created when 'Create Invoice' is being clicked after confirming "
 "the sale order. This transaction moves the sale order to invoices."
 msgstr ""
-"La facture est créée quand on clique sur le bouton « Créer la facture » "
-"après confirmation de la commande du client."
+"Une Facture est créée lorsque 'Créer une Facture' est cliqué après "
+"confirmation de la Commande de Vente. Cette transaction déplacera la "
+"Commande de Vente vers les Factures."
 
 #. module: sale
 #: view:sale.order:0
@@ -901,16 +920,16 @@ msgid "Compute"
 msgstr "Calculer"
 
 #. module: sale
-#: model:process.node,note:sale.process_node_invoice0
-msgid "Draft customer invoice, to be reviewed by accountant."
-msgstr "Facture client en brouillon, doit être vérifier par le comptable"
+#: model:ir.actions.act_window,name:sale.action_shop_form
+#: model:ir.ui.menu,name:sale.menu_action_shop_form
+#: field:sale.order,shop_id:0
+msgid "Shop"
+msgstr "Magasin"
 
 #. module: sale
-#: selection:sale.order,state:0
-#: view:sale.order.line:0
-#: selection:sale.order.line,state:0
-msgid "Done"
-msgstr "Terminée"
+#: rml:sale.order:0
+msgid "VAT"
+msgstr "TVA"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -935,13 +954,6 @@ msgid "History"
 msgstr "Historique"
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You must first cancel all packings attached to this sale order."
-msgstr ""
-"Vous devez annuler en premier tous les colis attachés à cette commande."
-
-#. module: sale
 #: view:sale.order:0
 msgid "Make Invoice"
 msgstr "Créer facture"
@@ -981,7 +993,7 @@ msgstr "Qté"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Packing OUT is created for stockable products."
-msgstr "La livraison est créée pour les produits stockables."
+msgstr "Un colisage sortant est créé pour les produits stockables"
 
 #. module: sale
 #: view:sale.order:0
@@ -1025,9 +1037,20 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #. module: sale
-#: wizard_button:sale.advance_payment_inv,create,end:0
-msgid "Close"
-msgstr "Fermer"
+#: help:sale.order,state:0
+msgid ""
+"Gives the state of the quotation or sale order. The exception state is "
+"automatically set when a cancel operation occurs in the invoice validation "
+"(Invoice Exception) or in the packing list process (Shipping Exception). The "
+"'Waiting Schedule' state is set when the invoice is confirmed but waiting "
+"for the scheduler to run on the date 'Date Ordered'."
+msgstr ""
+"Donne l'état du devis ou de la commande de vente. L'état 'en Exception' est "
+"automatiquement placé lorsqu'une opération d'annulation apparaît dans la "
+"validation de la facture (Exception de Facturation) ou dans le processus de "
+"colisage (Exception de Livraison). L'état 'en Attente d'exécution' est placé "
+"lorsque la facture est confirmée mais attend que le Planificateur soit lancé "
+"à la Date de la Commande."
 
 #. module: sale
 #: view:sale.order:0
@@ -1036,9 +1059,9 @@ msgid "UoM"
 msgstr "UDM"
 
 #. module: sale
-#: selection:sale.order,order_policy:0
-msgid "Shipping & Manual Invoice"
-msgstr "Livraison et facture manuelle"
+#: field:sale.order.line,number_packages:0
+msgid "Number Packages"
+msgstr "Nombre de colis"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_deliver0
@@ -1046,14 +1069,21 @@ msgid ""
 "Confirming the packing list moves them to delivery order. This can be done "
 "by clicking on 'Validate' button."
 msgstr ""
-"Confirmer les mouvements des lignes de colisages des ordres de livraison. "
-"Ceci peut être fait en cliquant sur le bouton 'Valider'."
+"Confirmer la liste de colisage les déplacent vers la commande de livraison. "
+"Cela peut être fait en cliquant sur le bouton 'Valider'."
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_order_form
-#: model:ir.ui.menu,name:sale.menu_sale_order
-msgid "Sales Orders"
-msgstr "Commandes de Ventes"
+#: code:addons/sale/sale.py:0
+#, python-format
+msgid "You cannot cancel a sale order line that has already been invoiced !"
+msgstr ""
+"Vous ne pouvez pas annuler une ligne de commande de vente qui a déjà été "
+"facturée !"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "In Progress"
+msgstr "En cours"
 
 #. module: sale
 #: wizard_view:sale.advance_payment_inv,init:0
@@ -1118,7 +1148,7 @@ msgstr "Commandes"
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Quotation (A sale order in draft state)"
-msgstr "Devis (une commande en brouillon)"
+msgstr "Devis (Une commande en brouillon)"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
@@ -1139,7 +1169,7 @@ msgstr "Produit"
 #. module: sale
 #: wizard_button:sale.advance_payment_inv,create,open:0
 msgid "Open Advance Invoice"
-msgstr "Ouvrir les acomptes"
+msgstr "Ouvrir la Facture Anticipée"
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
@@ -1153,6 +1183,7 @@ msgid "Description"
 msgstr "Description"
 
 #. module: sale
+#: model:ir.module.module,shortdesc:sale.module_meta_information
 #: model:ir.ui.menu,name:sale.menu_sale_root
 msgid "Sales Management"
 msgstr "Gestion des ventes"
@@ -1168,11 +1199,6 @@ msgid "Deliver"
 msgstr "Livraison"
 
 #. module: sale
-#: field:sale.order.line,product_uos:0
-msgid "Product UOS"
-msgstr "Unité secondaire"
-
-#. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
 msgid "Quotation / Order"
 msgstr "Devis / Commande"
@@ -1185,7 +1211,7 @@ msgstr "Tél. :"
 #. module: sale
 #: rml:sale.order:0
 msgid "Quotation N°"
-msgstr "Devis N°"
+msgstr "N° de devis"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1204,15 +1230,15 @@ msgid "Cancel Assignation"
 msgstr "Annuler l'assignation"
 
 #. module: sale
-#: selection:sale.order.line,type:0
-msgid "on order"
-msgstr "Sur commande"
+#: selection:sale.order,order_policy:0
+msgid "Invoice from the Packing"
+msgstr "Facture basée sur le Colisage"
 
 #. module: sale
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_line_invoice
 #: model:ir.actions.wizard,name:sale.wizard_sale_order_make_invoice
 msgid "Make invoices"
-msgstr "Créer les factures"
+msgstr "Creer les factures"
 
 #. module: sale
 #: help:sale.order,partner_order_id:0
@@ -1227,13 +1253,6 @@ msgid "Customer"
 msgstr "Client"
 
 #. module: sale
-#: code:addons/sale/sale.py:0
-#, python-format
-msgid "You can not cancel a sale order line that has already been invoiced !"
-msgstr ""
-"Vous ne pouvez pas annuler un commande de vente qui vous avez déjà facturé !"
-
-#. module: sale
 #: field:product.product,pricelist_purchase:0
 msgid "Purchase Pricelists"
 msgstr "Liste de prix d'achats"
@@ -1242,7 +1261,8 @@ msgstr "Liste de prix d'achats"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete Sale Order(s) which are already confirmed !"
-msgstr "Impossible de supprimer des commandes qui sont déjà confirmées !"
+msgstr ""
+"Impossible de supprimer des commandes de ventes qui sont déjà confirmés !"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -1261,11 +1281,9 @@ msgid "New Quotation"
 msgstr "Nouveau devis"
 
 #. module: sale
-#: model:ir.actions.act_window,name:sale.action_shop_form
-#: model:ir.ui.menu,name:sale.menu_action_shop_form
-#: field:sale.order,shop_id:0
-msgid "Shop"
-msgstr "Magasin"
+#: view:sale.order:0
+msgid "Total amount"
+msgstr "Montant total"
 
 #. module: sale
 #: rml:sale.order:0
@@ -1274,6 +1292,16 @@ msgid "Date Ordered"
 msgstr "Date de commande"
 
 #. module: sale
+#: field:sale.order.line,product_uos:0
+msgid "Product UoS"
+msgstr "UdV Produit"
+
+#. module: sale
+#: selection:sale.order,state:0
+msgid "Manual In Progress"
+msgstr "Manuelle en cours"
+
+#. module: sale
 #: field:sale.order.line,product_uom:0
 msgid "Product UoM"
 msgstr "UP du produit"
@@ -1286,10 +1314,10 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
-"Par défaut, OpenERP est en mesure de gérer les chemins complexes de routage "
-"et de produits dans votre entrepôt et ceux des partenaires. Cela permettra "
-"de configurer les méthodes plus courantes et les simples pour offrir des "
-"produits au client en une ou deux opérations par le travailleur."
+"Par défaut, Open ERP est capable de gérer des routages et des acheminements "
+"complexes de produits dans vos entrepôts et emplacements partenaire. Cela "
+"configurera les méthodes les plus communes et les plus simples pour livrer "
+"des produits vers le client en une ou deux opérations par travailleur."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
@@ -1304,7 +1332,7 @@ msgstr "Commande"
 #. module: sale
 #: rml:sale.order:0
 msgid "Payment Terms"
-msgstr "Conditions de règlement"
+msgstr "Conditions de Paiement"
 
 #. module: sale
 #: view:sale.order:0
@@ -1319,17 +1347,22 @@ msgstr "Délai de livraison"
 #. module: sale
 #: view:sale.order:0
 msgid "Related invoices"
-msgstr "Factures associées"
+msgstr "Factures associees"
+
+#. module: sale
+#: field:sale.shop,name:0
+msgid "Shop Name"
+msgstr "Nom du Magasin"
 
 #. module: sale
 #: field:sale.order,payment_term:0
 msgid "Payment Term"
-msgstr "Condition de règlement"
+msgstr "Condition de paiement"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Payment Before Delivery"
-msgstr "Règlement avant livraison"
+msgstr "Paiement avant livraison"
 
 #. module: sale
 #: help:sale.order,invoice_ids:0
@@ -1365,6 +1398,11 @@ msgid "Picked"
 msgstr "Réceptionné"
 
 #. module: sale
+#: view:sale.shop:0
+msgid "Accounting"
+msgstr "Comptabilité"
+
+#. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
 msgid "Invoice Based on Deliveries"
 msgstr "Facture basé sur les livraisons"
@@ -1372,7 +1410,7 @@ msgstr "Facture basé sur les livraisons"
 #. module: sale
 #: view:sale.order:0
 msgid "Stock Moves"
-msgstr "Mouvements de stock"
+msgstr "Mouvements de stocks"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
diff --git a/addons/sale/report/prepare_allot.rml b/addons/sale/report/prepare_allot.rml
deleted file mode 100644
index 336b6a49437..00000000000
--- a/addons/sale/report/prepare_allot.rml
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-      <blockBackground colorName="#808080" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#808080" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#808080" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#808080" start="3,0" stop="3,0"/>
-      <blockBackground colorName="#808080" start="4,0" stop="4,0"/>
-      <blockBackground colorName="#808080" start="5,0" stop="5,0"/>
-      <blockBackground colorName="#808080" start="6,0" stop="6,0"/>
-      <blockBackground colorName="#808080" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table5">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-      <blockBackground colorName="#999999" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#999999" start="1,0" stop="1,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-      <blockBackground colorName="#cccccc" start="0,0" stop="0,0"/>
-      <blockBackground colorName="#cccccc" start="1,0" stop="1,0"/>
-      <blockBackground colorName="#cccccc" start="2,0" stop="2,0"/>
-      <blockBackground colorName="#cccccc" start="3,0" stop="3,0"/>
-      <blockBackground colorName="#cccccc" start="4,0" stop="4,0"/>
-      <blockBackground colorName="#cccccc" start="5,0" stop="5,0"/>
-      <blockBackground colorName="#cccccc" start="6,0" stop="6,0"/>
-      <blockBackground colorName="#cccccc" start="7,0" stop="7,0"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table7">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="GRID" colorName="black"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/>
-    <paraStyle name="P2" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/>
-    <paraStyle name="P3" fontName="Times-Roman" fontSize="25.0" leading="31" alignment="CENTER"/>
-    <paraStyle name="P4" fontName="Times-Roman"/>
-    <paraStyle name="P5" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="P6" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="P7" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P8" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P9" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P10" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P11" fontName="Times-Roman" fontSize="8.0" leading="10" alignment="CENTER"/>
-    <paraStyle name="P12" fontName="Times-Roman" fontSize="11.0" leading="14"/>
-    <paraStyle name="P13" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/>
-    <paraStyle name="P14" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P15" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P16" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P17" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="RIGHT"/>
-    <paraStyle name="P18" fontName="Times-Roman" alignment="RIGHT"/>
-    <paraStyle name="P19" fontName="Times-Roman" fontSize="10.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P20" fontName="Times-Roman"/>
-    <paraStyle name="P21" fontName="Times-Roman" fontSize="9.0" leading="11"/>
-    <paraStyle name="P22" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/>
-    <paraStyle name="P23" fontName="Times-Roman" alignment="LEFT"/>
-    <paraStyle name="P24" fontName="Times-Roman" fontSize="10.0" leading="13"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-  </stylesheet>
-  <story>
-    <para style="P1">[[ repeatIn(objects, 'o') ]]</para>
-    <para style="P2">
-      <font color="white"> </font>
-    </para>
-    <para style="P1">Preparation order [[ o.name ]]</para>
-    <para style="P3">[[ o.state!='done' and 'draft' or '' ]]</para>
-    <para style="P2">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="241.0,241.0" repeatRows="1" style="Table1">
-      <tr>
-        <td>
-          <para style="P4">Shipped to</para>
-          <para style="P5">[[ o.partner_shipping_id.partner_id.name ]]</para>
-          <para style="P6">[[ o.partner_shipping_id.street ]]</para>
-          <para style="P6">[[ o.partner_shipping_id.zip ]] [[ o.partner_shipping_id.city ]]</para>
-        </td>
-        <td>
-          <para style="P4">Ordered by</para>
-          <para style="P5">[[ o.partner_order_id.partner_id.name ]]</para>
-          <para style="P6">[[ o.partner_order_id.street ]]</para>
-          <para style="P6">[[ o.partner_order_id.zip ]] [[ o.partner_order_id.city ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="Standard">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="85.0,99.0,85.0,99.0,113.0" repeatRows="1" style="Table2">
-      <tr>
-        <td>
-          <para style="P7">Order ref.</para>
-        </td>
-        <td>
-          <para style="P8">Order date </para>
-        </td>
-        <td>
-          <para style="P8">Shipping Date </para>
-        </td>
-        <td>
-          <para style="P8">Delivery date 1</para>
-        </td>
-        <td>
-          <para style="P8">Delivery date 2</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="P9">[[ o.name ]]</para>
-        </td>
-        <td>
-          <para style="P9">[[ o.date_order ]]</para>
-        </td>
-        <td>
-          <para style="P9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P10">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="P10">[[reduce(lambda x, line: line.date_planned&gt;x and line.date_planned or x, o.order_line, '')]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="57.0,170.0,57.0,42.0,28.0,42.0,42.0,42.0" repeatRows="1" style="Table3">
-      <tr>
-        <td>
-          <para style="P11">Reference</para>
-        </td>
-        <td>
-          <para style="P11">Designation</para>
-        </td>
-        <td>
-          <para style="P11">Package</para>
-        </td>
-        <td>
-          <para style="P11">Quantity</para>
-        </td>
-        <td>
-          <para style="P11">S.U</para>
-        </td>
-        <td>
-          <para style="P11">Prepared Package</para>
-        </td>
-        <td>
-          <para style="P11">Prepared quantity</para>
-        </td>
-        <td>
-          <para style="P11">Batch</para>
-        </td>
-      </tr>
-    </blockTable>
-    <section>
-      <para style="Text body">[[ repeatIn(allotment(o), 'lot') ]]</para>
-      <blockTable colWidths="85.0,397.0" style="Table5">
-        <tr>
-          <td>
-            <para style="P12">[[ repeatIn(lot[0], 'cust') ]] <font face="Times-Roman">Final customer:</font></para>
-          </td>
-          <td>
-            <para style="P13">[[ cust.partner_id.name ]] - [[ cust.name ]]</para>
-            <para style="P13">[[ cust.street ]]</para>
-            <para style="P13">[[ cust.zip ]] [[ cust.city ]] - [[ cust.country_id.name ]]</para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="Text body">[[ repeatIn(lot[1], 'line') ]]</para>
-      <blockTable colWidths="57.0,170.0,57.0,43.0,28.0,42.0,42.0,41.0" style="Table4">
-        <tr>
-          <td>
-            <para style="P14">[[line.product_id.code]]</para>
-          </td>
-          <td>
-            <para style="P14">[[line.product_id.name]]</para>
-          </td>
-          <td>
-            <para style="P15">[[line.number_packages]]</para>
-          </td>
-          <td>
-            <para style="P15">[[line.product_uom_qty]]</para>
-          </td>
-          <td>
-            <para style="P14">[[line.product_uom.name]]</para>
-          </td>
-          <td>
-            <para style="P14">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P14">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P14">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="P16">[[line.product_id.ean13]]</para>
-          </td>
-          <td>
-            <para style="P16">Logistical unit : [[line.product_packaging.qty]]</para>
-            <para style="P16">[[line.number_packages and 'Packaging : %d packages of %d P' % (line.number_packages, line.product_packaging.qty) or '']]</para>
-          </td>
-          <td>
-            <para style="P17">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P18">
-              <font face="Times-Roman" size="10.0">[[line.product_uos_qty]]</font>
-            </para>
-          </td>
-          <td>
-            <para style="P19">[[line.product_uos and line.product_uos.name or '']]</para>
-          </td>
-          <td>
-            <para style="P16">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P16">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P16">
-              <font color="white"> </font>
-            </para>
-            <para style="P16">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P20">
-        <font color="white"> </font>
-      </para>
-      <blockTable colWidths="57.0,170.0,57.0,42.0,28.0,42.0,42.0,41.0" style="Table7">
-        <tr>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P21">Number of packages</para>
-            <para style="P21">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="P22">[[ reduce(lambda x, line: x+ len(line.move_lines), o.picking_ids, 0)]]</para>
-          </td>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="Table Contents">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-      <para style="P23">
-        <font color="white"> </font>
-      </para>
-    </section>
-    <section>
-      <para style="Text body">
-        <font color="white"> </font>
-      </para>
-      <para style="Text body">
-        <font color="white"> </font>
-      </para>
-    </section>
-    <blockTable colWidths="482.0" repeatRows="1" style="Table6">
-      <tr>
-        <td>
-          <para style="P20">Invoiced to : <font face="Times-Roman" size="10.0">[[ o.partner_invoice_id.partner_id.name ]]</font></para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="P24">
-      <font color="white"> </font>
-    </para>
-  </story>
-</document>
-
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e36d1f15134..212b9f1903b 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -198,7 +198,7 @@ class sale_order(osv.osv):
         'date_order':fields.date('Date Ordered', required=True, readonly=True, states={'draft':[('readonly',False)]}),
 
         'user_id':fields.many2one('res.users', 'Salesman', states={'draft':[('readonly',False)]}, select=True),
-        'partner_id':fields.many2one('res.partner', 'Customer', readonly=True, states={'draft':[('readonly',False)]}, change_default=True, select=True),
+        'partner_id':fields.many2one('res.partner', 'Customer', readonly=True, states={'draft':[('readonly',False)]}, required=True, change_default=True, select=True),
         'partner_invoice_id':fields.many2one('res.partner.address', 'Invoice Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
         'partner_order_id':fields.many2one('res.partner.address', 'Ordering Contact', readonly=True, required=True, states={'draft':[('readonly',False)]}, help="The name and address of the contact that requested the order or quotation."),
         'partner_shipping_id':fields.many2one('res.partner.address', 'Shipping Address', readonly=True, required=True, states={'draft':[('readonly',False)]}),
@@ -215,7 +215,7 @@ class sale_order(osv.osv):
                     help="""The Shipping Policy is used to synchronise invoice and delivery operations.
   - The 'Pay before delivery' choice will first generate the invoice and then generate the packing order after the payment of this invoice.
   - The 'Shipping & Manual Invoice' will create the packing order directly and wait for the user to manually click on the 'Invoice' button to generate the draft invoice.
-  - The 'Invoice on Order Ater Delivery' choice will generate the draft invoice based on sale order after all packing lists have been finished.
+  - The 'Invoice on Order After Delivery' choice will generate the draft invoice based on sale order after all packing lists have been finished.
   - The 'Invoice from the packing' choice is used to create an invoice during the packing process."""),
         'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'project_id':fields.many2one('account.analytic.account', 'Analytic Account', readonly=True, states={'draft':[('readonly', False)]}),
@@ -273,7 +273,7 @@ class sale_order(osv.osv):
         sale_orders = self.read(cr, uid, ids, ['state'])
         unlink_ids = []
         for s in sale_orders:
-            if s['state'] in ['draft','canceled']:
+            if s['state'] in ['draft','cancel']:
                 unlink_ids.append(s['id'])
             else:
                 raise osv.except_osv(_('Invalid action !'), _('Cannot delete Sale Order(s) which are already confirmed !'))
@@ -730,7 +730,7 @@ class sale_order_line(osv.osv):
         'number_packages': fields.function(_number_packages, method=True, type='integer', string='Number Packages'),
         'notes': fields.text('Notes'),
         'th_weight' : fields.float('Weight'),
-        'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Canceled'),('exception','Exception')], 'Status', required=True, readonly=True),
+        'state': fields.selection([('draft','Draft'),('confirmed','Confirmed'),('done','Done'),('cancel','Cancelled'),('exception','Exception')], 'Status', required=True, readonly=True),
         'order_partner_id': fields.related('order_id', 'partner_id', type='many2one', relation='res.partner', string='Customer')
     }
     _order = 'sequence, id'
@@ -913,8 +913,7 @@ class sale_order_line(osv.osv):
                     uos = False
             else:
                 uos = False
-
-        result .update({'type': product_obj.procure_method})
+        result.update({'type': product_obj.procure_method})
         if product_obj.description_sale:
             result['notes'] = product_obj.description_sale
         fpos = fiscal_position and self.pool.get('account.fiscal.position').browse(cr, uid, fiscal_position) or False
@@ -994,7 +993,14 @@ class sale_order_line(osv.osv):
         if not uom:
             res['value']['price_unit'] = 0.0
         return res
-
+    
+    def unlink(self, cr, uid, ids, context={}):
+        """Allows to delete sale order lines in draft,cancel states"""
+        for rec in self.browse(cr, uid, ids, context=context):
+            if rec.state not in ['draft','cancel']:
+                raise osv.except_osv(_('Invalid action !'), _('Cannot delete a sale order line which is %s !')%(rec.state,))
+        return super(sale_order_line, self).unlink(cr, uid, ids, context=context)
+    
 sale_order_line()
 
 
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 32e42276074..f0b8da9a017 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -151,6 +151,7 @@
                                         <page groups="base.group_extended" string="Extra Info">
                                             <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/>
                                             <field groups="product.group_uos" name="product_uos"/>
+                                            <field name="th_weight"/>
                                             <field name="address_allotment_id" select="2"/>
                                             <separator colspan="4" string="Properties"/>
                                             <field colspan="4" name="property_ids" nolabel="1"/>
@@ -371,6 +372,7 @@
                     <field name="price_unit"/>
                     <field name="price_net"/>
                     <field name="price_subtotal"/>
+                    <field name="th_weight"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -398,6 +400,7 @@
                             <field name="type"/>
                             <field name="delay" select="2"/>
                             <field name="price_subtotal"/>
+                            <field name="th_weight"/>
                             <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
diff --git a/addons/sale_analytic_plans/i18n/fr_FR.po b/addons/sale_analytic_plans/i18n/fr_FR.po
index 399b7ff6199..4e671dd9eb0 100644
--- a/addons/sale_analytic_plans/i18n/fr_FR.po
+++ b/addons/sale_analytic_plans/i18n/fr_FR.po
@@ -4,21 +4,22 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:38+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 13:56+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
 #: field:sale.order.line,analytics_id:0
 msgid "Analytic Distribution"
-msgstr ""
+msgstr "Distribution Analytique"
 
 #. module: sale_analytic_plans
 #: constraint:ir.ui.view:0
@@ -28,5 +29,4 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: sale_analytic_plans
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
-msgstr ""
-
+msgstr "Gestion de la Distribution Analytique des Ventes"
diff --git a/addons/sale_crm/i18n/fr_FR.po b/addons/sale_crm/i18n/fr_FR.po
index d858ad5e0ea..e6dfcf2f1a4 100644
--- a/addons/sale_crm/i18n/fr_FR.po
+++ b/addons/sale_crm/i18n/fr_FR.po
@@ -1,19 +1,18 @@
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
-#	* sale_crm
-#
+# * sale_crm
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:26+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-20 12:43+0000\n"
+"PO-Revision-Date: 2009-07-07 13:45+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:56+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -22,9 +21,9 @@ msgid "Crm opportunity quotation"
 msgstr "Chiffrage de l'opportunité"
 
 #. module: sale_crm
-#: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
-msgid "Opportunity Analytic"
-msgstr "Analytique de l'opportunité"
+#: wizard_field:crm.case.make_order,init,partner_id:0
+msgid "Customer"
+msgstr "Client"
 
 #. module: sale_crm
 #: help:crm.case.make_order,init,partner_id:0
@@ -39,7 +38,7 @@ msgstr "Créer"
 #. module: sale_crm
 #: selection:crm.case.make_order,init,picking_policy:0
 msgid "All at once"
-msgstr "Tout en une fois"
+msgstr "Tous d'un coup"
 
 #. module: sale_crm
 #: constraint:ir.ui.view:0
@@ -49,12 +48,12 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_crmopportunityquotation
 msgid "Opportunity goes into the quotation"
-msgstr "L'opportunité passe en devis"
+msgstr "Opportunité dans ce devis"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractanalytic0
 msgid "Analytic account"
-msgstr "Compte analytique"
+msgstr "Compte Analytique"
 
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmquotation0
@@ -79,7 +78,7 @@ msgstr "Créer un chiffrage"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_contractpricelist0
 msgid "Contract Volume (pricelist)"
-msgstr "Contrat en volume (liste de prix)"
+msgstr "Contrat en volume (Tarif)"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_crmopportunity0
@@ -87,6 +86,11 @@ msgid "CRM Opportunity"
 msgstr "CRM Opportunité"
 
 #. module: sale_crm
+#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
+msgid "Sale CRM Stuff"
+msgstr "Étape CRM / Vente"
+
+#. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunityquotation0
 msgid "Opportunity convert into quotation"
 msgstr "Convertir une opportunité en chiffrage"
@@ -119,14 +123,41 @@ msgstr ""
 "Vérifier ceci pour fermer le cas après la création de la commande de vente"
 
 #. module: sale_crm
-#: wizard_field:crm.case.make_order,init,partner_id:0
-msgid "Customer"
-msgstr "Client"
+#: model:ir.module.module,description:sale_crm.module_meta_information
+msgid ""
+"\n"
+"This module adds a shortcut on one or several cases in the CRM.\n"
+"This shortcut allows you to generate a sale order based the selected case.\n"
+"If different cases are open (a list), it generates one sale order by\n"
+"case.\n"
+"The case is then closed and linked to the generated sale order.\n"
+"\n"
+"It also add a shortcut on one or several partners.\n"
+"This shortcut allows you to generate a CRM case for the partners.\n"
+"\n"
+"We suggest you to install this module if you installed both the sale and "
+"the\n"
+"crm_configuration modules.\n"
+"    "
+msgstr ""
+"\n"
+"Ce module ajoute des raccourcis entre un ou plusieurs cas de la CRM.\n"
+"Ces raccourcis autorisent la génération des commandes de ventes basé sur le "
+"cas sélectionné.\n"
+"Si différent cas sont ouverts (une liste), cela générera une commande\n"
+"par cas.\n"
+"Ce cas est fermé et lié aux commandes de ventes générés.\n"
+"\n"
+"Cela ajoute également un raccourcis sur un ou plusieurs partenaires.\n"
+"\n"
+"Nous vous suggérons d'installer ce module si vous avez les modules sale et "
+"crm_configuration d'installés.\n"
+"    "
 
 #. module: sale_crm
 #: model:process.transition,note:sale_crm.process_transition_opportunitypricelist0
 msgid "Opporunity convert to the Pricelist"
-msgstr "Opportunité converti en liste de prix"
+msgstr "Opportunité converti en tarif"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,user:0
@@ -139,6 +170,11 @@ msgid "Reflect the contract made with customer"
 msgstr "Refleter le contrat passé avec le client"
 
 #. module: sale_crm
+#: model:process.transition,name:sale_crm.process_transition_opportunityanalytic0
+msgid "Opportunity Analytic"
+msgstr "Analytique de l'opportunité"
+
+#. module: sale_crm
 #: wizard_field:crm.case.make_order,init,products:0
 msgid "Products"
 msgstr "Produits"
@@ -162,17 +198,17 @@ msgstr "Magasin"
 #. module: sale_crm
 #: model:process.node,note:sale_crm.process_node_crmopportunity0
 msgid "The CRM Opportunity can lead to a quotation."
-msgstr "L'opportunité de CRM peut mener à un devis"
+msgstr "Une opportunité de la CRM peut devenir un devis."
 
 #. module: sale_crm
 #: model:process.transition,name:sale_crm.process_transition_opportunitypricelist0
 msgid "Opportunity Pricelist"
-msgstr "Liste de prix de l'opporunité"
+msgstr "Tarif de l'opporunité"
 
 #. module: sale_crm
 #: model:process.node,name:sale_crm.process_node_contractpricelist0
 msgid "Contract Pricelist"
-msgstr "Liste de prix du contrat"
+msgstr "Tarif du contrat"
 
 #. module: sale_crm
 #: wizard_field:sale_crm.make_case,init,name:0
@@ -200,8 +236,3 @@ msgstr "Annuler"
 #: wizard_field:sale_crm.make_case,init,section:0
 msgid "Case Section"
 msgstr "Section du cas"
-
-#. module: sale_crm
-#: model:ir.module.module,shortdesc:sale_crm.module_meta_information
-msgid "Sale CRM Stuff"
-msgstr "Ventes à partir de Cas"
diff --git a/addons/sale_delivery_report/i18n/fr_FR.po b/addons/sale_delivery_report/i18n/fr_FR.po
index dd97cec4c7d..00a4ffd0328 100644
--- a/addons/sale_delivery_report/i18n/fr_FR.po
+++ b/addons/sale_delivery_report/i18n/fr_FR.po
@@ -4,16 +4,17 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.1\n"
+"Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-07-07 13:52+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 14:44+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -43,22 +44,22 @@ msgstr "Ordre de ivraison :"
 #. module: sale_delivery_report
 #: model:ir.actions.report.xml,name:sale_delivery_report.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Bordereau de livraison"
 
 #. module: sale_delivery_report
 #: model:ir.module.module,shortdesc:sale_delivery_report.module_meta_information
 msgid "Print Delivery Order"
-msgstr ""
+msgstr "Imprimer le bordereau de livraison"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Carrier"
-msgstr ""
+msgstr "Transporteur"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Facturé à"
 
 #. module: sale_delivery_report
 #: rml:sale.shipping:0
@@ -74,4 +75,3 @@ msgstr "Date de Livraison"
 #: rml:sale.shipping:0
 msgid "Quantity"
 msgstr "Quantité"
-
diff --git a/addons/sale_journal/i18n/fr_FR.po b/addons/sale_journal/i18n/fr_FR.po
index ec3619444cd..b37a29e7dc4 100644
--- a/addons/sale_journal/i18n/fr_FR.po
+++ b/addons/sale_journal/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:24+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_journal
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_journal_sale_stats
@@ -396,8 +397,11 @@ msgstr "Ouvert"
 
 #. module: sale_journal
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: sale_journal
 #: view:res.partner:0
@@ -548,4 +552,3 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale_journal.act_sale_journal_sale_journal_2_sale_order_approved
 msgid "Approved sales"
 msgstr "Ventes Approuvées"
-
diff --git a/addons/scrum/i18n/fr_FR.po b/addons/scrum/i18n/fr_FR.po
index 92d815449f9..b5899cd90e8 100644
--- a/addons/scrum/i18n/fr_FR.po
+++ b/addons/scrum/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 14:46+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: scrum
 #: view:scrum.product.backlog:0
@@ -64,7 +65,9 @@ msgstr "Progression"
 
 #. module: scrum
 #: help:scrum.task,remaining_hours:0
-msgid "Total remaining time, can be re-estimated periodically by the assignee of the task."
+msgid ""
+"Total remaining time, can be re-estimated periodically by the assignee of "
+"the task."
 msgstr ""
 
 #. module: scrum
@@ -99,7 +102,9 @@ msgstr "Tâches déléguées"
 
 #. module: scrum
 #: help:scrum.project,warn_header:0
-msgid "Header added at the beginning of the email for the warning message sent to the customer when a task is closed."
+msgid ""
+"Header added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
 msgstr ""
 
 #. module: scrum
@@ -119,7 +124,8 @@ msgstr "Voir le Retard du Projet"
 
 #. module: scrum
 #: help:scrum.project,members:0
-msgid "Project's member. Not used in any computation, just for information purpose."
+msgid ""
+"Project's member. Not used in any computation, just for information purpose."
 msgstr ""
 
 #. module: scrum
@@ -140,7 +146,9 @@ msgstr "Nom du Sprint"
 
 #. module: scrum
 #: help:scrum.task,planned_hours:0
-msgid "Estimated time to do the task, usually set by the project manager when the task is in draft state."
+msgid ""
+"Estimated time to do the task, usually set by the project manager when the "
+"task is in draft state."
 msgstr ""
 
 #. module: scrum
@@ -163,7 +171,9 @@ msgstr "Projet"
 
 #. module: scrum
 #: help:scrum.project,warn_manager:0
-msgid "If you check this field, the project manager will receive a request each time a task is completed by his team."
+msgid ""
+"If you check this field, the project manager will receive a request each "
+"time a task is completed by his team."
 msgstr ""
 
 #. module: scrum
@@ -199,7 +209,9 @@ msgstr ""
 
 #. module: scrum
 #: help:scrum.project,warn_customer:0
-msgid "If you check this, the user will have a popup when closing a task that propose a message to send by email to the customer."
+msgid ""
+"If you check this, the user will have a popup when closing a task that "
+"propose a message to send by email to the customer."
 msgstr ""
 
 #. module: scrum
@@ -545,7 +557,9 @@ msgstr "Actif"
 
 #. module: scrum
 #: help:scrum.task,delay_hours:0
-msgid "Computed as: Total Time - Estimated Time. It gives the difference of the time estimated by the project manager and the real time to close the task."
+msgid ""
+"Computed as: Total Time - Estimated Time. It gives the difference of the "
+"time estimated by the project manager and the real time to close the task."
 msgstr ""
 
 #. module: scrum
@@ -601,7 +615,9 @@ msgstr ""
 
 #. module: scrum
 #: help:scrum.task,project_id:0
-msgid "If you have [?] in the project name, it means there are no analytic account linked to this project."
+msgid ""
+"If you have [?] in the project name, it means there are no analytic account "
+"linked to this project."
 msgstr ""
 
 #. module: scrum
@@ -627,7 +643,10 @@ msgstr "Résumé de la tâche"
 
 #. module: scrum
 #: help:scrum.project,category_id:0
-msgid "Link this project to an analytic account if you need financial management on projects. It enables you to connect projects with budgets, planning, cost and revenue analysis, timesheets on projects, etc."
+msgid ""
+"Link this project to an analytic account if you need financial management on "
+"projects. It enables you to connect projects with budgets, planning, cost "
+"and revenue analysis, timesheets on projects, etc."
 msgstr ""
 
 #. module: scrum
@@ -675,8 +694,11 @@ msgstr "Critique du Sprint"
 
 #. module: scrum
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: scrum
 #: field:scrum.task,remaining_hours:0
@@ -828,7 +850,9 @@ msgstr "Séquence"
 
 #. module: scrum
 #: help:scrum.project,warn_footer:0
-msgid "Footer added at the beginning of the email for the warning message sent to the customer when a task is closed."
+msgid ""
+"Footer added at the beginning of the email for the warning message sent to "
+"the customer when a task is closed."
 msgstr ""
 
 #. module: scrum
@@ -869,4 +893,3 @@ msgstr ""
 #: field:scrum.project,warn_footer:0
 msgid "Mail Footer"
 msgstr ""
-
diff --git a/addons/stock/i18n/fr_FR.po b/addons/stock/i18n/fr_FR.po
index ac424226dcd..278830fa6f6 100644
--- a/addons/stock/i18n/fr_FR.po
+++ b/addons/stock/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-05-20 12:13+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:05+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -109,7 +110,7 @@ msgstr "Liste des Colisages"
 #: code:addons/stock/report_stock.py:0
 #, python-format
 msgid "You cannot delete any record!"
-msgstr "Vous ne pouvez pas supprimer d'enregistrement !"
+msgstr ""
 
 #. module: stock
 #: xsl:stock.location.overview:0
@@ -202,7 +203,7 @@ msgstr "État"
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr "Valeur Réelle du Stock"
+msgstr ""
 
 #. module: stock
 #: view:stock.move:0
@@ -235,7 +236,7 @@ msgstr "STOCK_QUIT"
 #: code:addons/stock/wizard/wizard_inventory.py:0
 #, python-format
 msgid "No product in this location."
-msgstr "Aucun produit à cet emplacement."
+msgstr ""
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
@@ -260,13 +261,13 @@ msgstr "terp-hr"
 #. module: stock
 #: field:stock.location,usage:0
 msgid "Location Type"
-msgstr "Type d'emplacement"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/wizard_invoice_onshipping.py:0
 #, python-format
 msgid "Invoice cannot be created from Packing."
-msgstr "Une Facture ne peut être créée à partir du Colisage."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -446,7 +447,9 @@ msgstr "Adresse du dépôt"
 #. module: stock
 #: help:stock.move,prodlot_id:0
 msgid "Production lot is used to put a serial number on the production"
-msgstr "Le lot de production est utilisé pour mettre un numéro de série lors de la production"
+msgstr ""
+"Le lot de production est utilisé pour mettre un numéro de série lors de la "
+"production"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_13
@@ -521,13 +524,18 @@ msgstr "STOCK_CUT"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
-msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated when you do an inventory"
-msgstr "Cette localisation de stock sera utilisée au lieu de celle par défaut, en tant que localisation source générées quand vous effectué un inventaire"
+msgid ""
+"For the current product (template), this stock location will be used, "
+"instead of the default one, as the source location for stock moves generated "
+"when you do an inventory"
+msgstr ""
+"Cette localisation de stock sera utilisée au lieu de celle par défaut, en "
+"tant que localisation source générées quand vous effectué un inventaire"
 
 #. module: stock
 #: field:stock.move,date_planned:0
 msgid "Scheduled Date"
-msgstr "Date Planifiée"
+msgstr ""
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
@@ -541,8 +549,11 @@ msgstr "STOCK_ZOOM_FIT"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
-msgid "This journal will be used for the accounting move generated by stock move"
-msgstr "Ce journal sera utilisé pour les mouvements de compte générés par les mouvements de stock"
+msgid ""
+"This journal will be used for the accounting move generated by stock move"
+msgstr ""
+"Ce journal sera utilisé pour les mouvements de compte générés par les "
+"mouvements de stock"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
@@ -588,7 +599,7 @@ msgstr "STOCK_DIALOG_ERROR"
 #. module: stock
 #: field:stock.location,parent_left:0
 msgid "Left Parent"
-msgstr "Parent gauche"
+msgstr ""
 
 #. module: stock
 #: field:report.stock.lines.date,create_date:0
@@ -632,7 +643,7 @@ msgstr "Emplacement Production"
 #. module: stock
 #: field:stock.move,tracking_id:0
 msgid "Tracking Lot"
-msgstr "Lot de Traçage"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -696,8 +707,9 @@ msgstr "Emplacements partenaire"
 
 #. module: stock
 #: help:stock.move,tracking_id:0
-msgid "Tracking lot is the code that will be put on the logistical unit/pallet"
-msgstr "Le Lot de Traçage est le code qui sera placé sur l'unité logistique ou la pallette "
+msgid ""
+"Tracking lot is the code that will be put on the logistical unit/pallet"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -785,7 +797,7 @@ msgstr "En attente"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree7
 #: model:ir.ui.menu,name:stock.menu_picking_waiting
 msgid "Available Packing"
-msgstr "Colisage Disponible"
+msgstr ""
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_warehouse
@@ -811,7 +823,7 @@ msgstr "Fournisseurs IT Générique"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_location_overview_all
 msgid "Location Content (With children)"
-msgstr "Contenu de l'emplacement (avec les fils)"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -838,7 +850,7 @@ msgstr "STOCK_CONNECT"
 #: model:ir.ui.menu,name:stock.menu_action_picking_all
 #: wizard_field:stock.picking.make,init,pickings:0
 msgid "Packing"
-msgstr "Colisage"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -860,7 +872,7 @@ msgstr "STOCK_OK"
 #: model:ir.actions.act_window,name:stock.action_picking_tree9
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree9
 msgid "New Internal Packing"
-msgstr "Nouveau Colisage Interne"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
@@ -972,13 +984,13 @@ msgstr "STOCK_GO_BACK"
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "To Be Invoiced"
-msgstr "À facturer"
+msgstr ""
 
 #. module: stock
 #: view:product.product:0
 #: view:product.template:0
 msgid "Counter-Part Locations Properties"
-msgstr "Propriétés des Emplacements Contre-Partie"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -1025,7 +1037,7 @@ msgstr "STOCK_APPLY"
 #: code:addons/stock/wizard/wizard_invoice_onshipping.py:0
 #, python-format
 msgid "Invoice is not created"
-msgstr "Facture non créée"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/inventory_merge.py:0
@@ -1135,7 +1147,7 @@ msgstr "Information"
 #: code:addons/stock/wizard/wizard_return.py:0
 #, python-format
 msgid "Provide the quantities of the returned products."
-msgstr "Fournissez les quantités des produits retournés."
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1166,8 +1178,12 @@ msgstr "Effectuer plus tard"
 
 #. module: stock
 #: help:res.partner,property_stock_supplier:0
-msgid "This stock location will be used, instead of the default one, as the source location for goods you receive from the current partner"
-msgstr "Cette localisation de stock sera utilisée au lieu de celle par défaut, en tant que localisation source pour les biens recus du partenaire courant"
+msgid ""
+"This stock location will be used, instead of the default one, as the source "
+"location for goods you receive from the current partner"
+msgstr ""
+"Cette localisation de stock sera utilisée au lieu de celle par défaut, en "
+"tant que localisation source pour les biens recus du partenaire courant"
 
 #. module: stock
 #: field:stock.warehouse,partner_address_id:0
@@ -1177,7 +1193,7 @@ msgstr "Adresses du propriétaire"
 #. module: stock
 #: field:stock.location,parent_right:0
 msgid "Right Parent"
-msgstr "Parent Droit"
+msgstr ""
 
 #. module: stock
 #: field:stock.picking,origin:0
@@ -1238,7 +1254,7 @@ msgstr "Liste des Colisages Entrants"
 #: model:ir.model,name:stock.model_stock_picking
 #: field:stock.move,picking_id:0
 msgid "Packing List"
-msgstr "Liste de Colisage"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1270,7 +1286,7 @@ msgstr "Compte de Stock Sortant"
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic No Step Added"
-msgstr "Aucune Étape Ajoutée Automatiquement"
+msgstr "Automatique aucun pas ajouter"
 
 #. module: stock
 #: wizard_view:stock.location.products,init:0
@@ -1287,13 +1303,13 @@ msgstr "STOCK_CDROM"
 #: code:addons/stock/wizard/wizard_invoice_onshipping.py:0
 #, python-format
 msgid "Error"
-msgstr "Erreur"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/wizard/wizard_invoice_onshipping.py:0
 #, python-format
 msgid "Invoice is already created."
-msgstr "Facture déjà créée."
+msgstr ""
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -1313,7 +1329,7 @@ msgstr "Casse"
 #. module: stock
 #: field:stock.production.lot,ref:0
 msgid "Internal Ref"
-msgstr "Réf. Interne"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1488,18 +1504,21 @@ msgstr "Annuler inventaire"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_product_history
 msgid "Future Stock Forecast"
-msgstr "Prévision de Stock Futur"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/report_stock.py:0
 #, python-format
 msgid "Error !"
-msgstr "Erreur !"
+msgstr ""
 
 #. module: stock
 #: model:ir.module.module,description:stock.module_meta_information
-msgid "OpenERP Stock Management module can manage multi-warehouses, multi and structured stock locations.\n"
-"Thanks to the double entry management, the inventory controlling is powerful and flexible:\n"
+msgid ""
+"OpenERP Stock Management module can manage multi-warehouses, multi and "
+"structured stock locations.\n"
+"Thanks to the double entry management, the inventory controlling is powerful "
+"and flexible:\n"
 "* Moves history and planning,\n"
 "* Different inventory methods (FIFO, LIFO, ...)\n"
 "* Stock valuation (standard or average price, ...)\n"
@@ -1510,17 +1529,6 @@ msgid "OpenERP Stock Management module can manage multi-warehouses, multi and st
 "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
 "    "
 msgstr ""
-"Le module de Gestion de Stock d'Open ERP peut gérer plusieurs entrepôts, ainsi que de multiples emplacements de stock.\n"
-"Grâce à la gestion des écritures en double entrée, le contrôle des inventaires est puissant et flexible:\n"
-"* historique des mouvements et planification,\n"
-"* gestion de plusieurs méthodes d'inventaire différentes (FIFO, LIFO, ...)\n"
-"* valorisation du Stock (prix standard, prix moyen, ...)\n"
-"* robustesse face aux différence d'inventaire\n"
-"* règles de réordonancement automatiques (niveau de stock, JIT, ...)\n"
-"* support des codes barres\n"
-"* détection rapide des erreurs grâce au système de double entrée\n"
-"* traçabilité (amont, aval, lots de production, numéro de série, ...)\n"
-"    "
 
 #. module: stock
 #: selection:stock.location,chained_location_type:0
@@ -1529,8 +1537,11 @@ msgstr "Emplacement fixe"
 
 #. module: stock
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: stock
 #: field:stock.picking,min_date:0
@@ -1567,7 +1578,7 @@ msgstr "STOCK_DELETE"
 #. module: stock
 #: model:account.journal,name:stock.stock_journal
 msgid "Stock Journal"
-msgstr "Journal de Stock"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1608,7 +1619,7 @@ msgstr "terp-mrp"
 #: model:ir.actions.act_window,name:stock.action_picking_tree3_delivery
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3_delivery
 msgid "Future Delivery Orders"
-msgstr "Commandes de Livraison Futures"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1666,7 +1677,7 @@ msgstr "Créer les factures"
 #. module: stock
 #: field:stock.production.lot.revision,date:0
 msgid "Revision Date"
-msgstr "Date de Révision"
+msgstr ""
 
 #. module: stock
 #: rml:stock.picking.list:0
@@ -1687,7 +1698,7 @@ msgstr "Quantité (UP)"
 #: model:ir.actions.act_window,name:stock.action_picking_tree5
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree5
 msgid "Packing to Process"
-msgstr "Colisage à Traiter"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1775,7 +1786,7 @@ msgstr "Vers"
 #. module: stock
 #: field:stock.production.lot.revision,name:0
 msgid "Revision Name"
-msgstr "Nom de Révision"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1807,7 +1818,7 @@ msgstr "Magasin"
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Done"
-msgstr "Terminé"
+msgstr "Terminer"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_virtual
@@ -1832,8 +1843,11 @@ msgstr "Date de fin"
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
-msgid "Please put a partner on the picking list if you want to generate invoice."
-msgstr "Merci de mettre un partenaire sur la liste de colisage si vous souhaitez faire une facture."
+msgid ""
+"Please put a partner on the picking list if you want to generate invoice."
+msgstr ""
+"Merci de mettre un partenaire sur la liste de colisage si vous souhaitez "
+"faire une facture."
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -2028,7 +2042,7 @@ msgstr "STOCK_FIND"
 #: code:addons/stock/wizard/wizard_inventory.py:0
 #, python-format
 msgid "Message !"
-msgstr "Message !"
+msgstr ""
 
 #. module: stock
 #: view:stock.inventory:0
@@ -2037,13 +2051,13 @@ msgstr "Inventaire du Lot"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
-msgid "This is used only if you selected a chained location type.\n"
-"The 'Automatic Move' value will create a stock move after the current one that will be validated automatically. With 'Manual Operation', the stock move has to be validated by a worker. With 'Automatic No Step Added', the location is replaced in the original move."
+msgid ""
+"This is used only if you selected a chained location type.\n"
+"The 'Automatic Move' value will create a stock move after the current one "
+"that will be validated automatically. With 'Manual Operation', the stock "
+"move has to be validated by a worker. With 'Automatic No Step Added', the "
+"location is replaced in the original move."
 msgstr ""
-"est uniquement utilisé si vous avez sélectionné le type d'emplacement chainé.\n"
-"La valeur 'Mouvement Automatique' créera un mouvement de stock après celui courant qui sera validé Automatiquement. "
-"Avec 'Opération Manuelle', le mouvement de stock devra être validé par un travailleur. Avec "
-"'Aucune Étape Ajoutée Automatiquement', l'emplacement est remplacé avec le mouvement original."
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -2063,8 +2077,11 @@ msgstr "Ok"
 
 #. module: stock
 #: help:product.template,property_stock_account_input:0
-msgid "This account will be used, instead of the default one, to value input stock"
-msgstr "Ce compte sera utilisé, à la place de celui par défaut, pour valoriser le stock entrant"
+msgid ""
+"This account will be used, instead of the default one, to value input stock"
+msgstr ""
+"Ce compte sera utilisé, à la place de celui par défaut, pour valoriser le "
+"stock entrant"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_8
@@ -2101,7 +2118,7 @@ msgstr "Réception de marchandise"
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Location"
-msgstr "Emplacement de Stock"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2113,7 +2130,7 @@ msgstr "STOCK_MEDIA_PLAY"
 #: code:addons/stock/wizard/inventory_merge_zero.py:0
 #, python-format
 msgid "Warning"
-msgstr "Avertissement"
+msgstr ""
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree_delivery
@@ -2128,8 +2145,13 @@ msgstr "STOCK_OPEN"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
-msgid "This stock location will be used, instead of the default one, as the destination location for goods you send to this partner"
-msgstr "Cette emplacement de stock sera utilisée au lieu de celui par défaut en tant que l'emplacement de destination pour les biens que vous envoyez à ce partenaire."
+msgid ""
+"This stock location will be used, instead of the default one, as the "
+"destination location for goods you send to this partner"
+msgstr ""
+"Cette emplacement de stock sera utilisée au lieu de celui par défaut en tant "
+"que l'emplacement de destination pour les biens que vous envoyez à ce "
+"partenaire."
 
 #. module: stock
 #: selection:stock.move,state:0
@@ -2171,18 +2193,21 @@ msgstr "STOCK_DISCONNECT"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
-msgid "This account will be used, instead of the default one, to value output stock"
-msgstr "Ce compte sera utilisé, au lieu de celui par défaut, pour la valeur du stock de sortie"
+msgid ""
+"This account will be used, instead of the default one, to value output stock"
+msgstr ""
+"Ce compte sera utilisé, au lieu de celui par défaut, pour la valeur du stock "
+"de sortie"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Confirm (Do Not Process Now)"
-msgstr "Confirmer (Ne pas traiter maintenant)"
+msgstr ""
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves Tracked"
-msgstr "Mouvements Tracés"
+msgstr ""
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.next_id_61
@@ -2209,7 +2234,7 @@ msgstr "Configuration"
 #: code:addons/stock/wizard/inventory_merge_zero.py:0
 #, python-format
 msgid "Please select one and only one inventory !"
-msgstr "Veuillez sélectionner un et un seul inventaire !"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2239,7 +2264,7 @@ msgstr "Mouvement automatique"
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
 msgid "Virtual Stock Value"
-msgstr "Valeur de Stock Virtuel"
+msgstr ""
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2259,7 +2284,7 @@ msgstr "STOCK_GOTO_LAST"
 #. module: stock
 #: selection:stock.picking,invoice_state:0
 msgid "Invoiced"
-msgstr "Facturé"
+msgstr "Facturer"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2268,8 +2293,14 @@ msgstr "STOCK_DIRECTORY"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
-msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by production orders"
-msgstr "Pour le produit courant (patron), cet emplacement de stock sera utilisé, à la place de celui par défaut, comme emplacement source pour les mouvements de stock gérérés par les commandes de production"
+msgid ""
+"For the current product (template), this stock location will be used, "
+"instead of the default one, as the source location for stock moves generated "
+"by production orders"
+msgstr ""
+"Pour le produit courant (patron), cet emplacement de stock sera utilisé, à "
+"la place de celui par défaut, comme emplacement source pour les mouvements "
+"de stock gérérés par les commandes de production"
 
 #. module: stock
 #: view:stock.picking.move.wizard:0
@@ -2299,7 +2330,7 @@ msgstr "STOCK_JUSTIFY_CENTER"
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree3
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree8
 msgid "Confirmed Packing Waiting Availability"
-msgstr "Colisage Confirmé en attente de disponibilité"
+msgstr ""
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -2350,7 +2381,7 @@ msgstr "Diviser les lignes"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr "Mouvements de Stock Futurs"
+msgstr ""
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -2360,8 +2391,14 @@ msgstr ""
 
 #. module: stock
 #: help:product.template,property_stock_procurement:0
-msgid "For the current product (template), this stock location will be used, instead of the default one, as the source location for stock moves generated by procurements"
-msgstr "Pour le produit courant (patron), cet emplacement de stock sera utilisé, à la place de celui par défaut, comme emplacement source pour les mouvements de stock gérérés par les approvisionnements"
+msgid ""
+"For the current product (template), this stock location will be used, "
+"instead of the default one, as the source location for stock moves generated "
+"by procurements"
+msgstr ""
+"Pour le produit courant (patron), cet emplacement de stock sera utilisé, à "
+"la place de celui par défaut, comme emplacement source pour les mouvements "
+"de stock gérérés par les approvisionnements"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_picking_move_wizard
@@ -2509,7 +2546,7 @@ msgstr "Client"
 #: model:ir.actions.act_window,name:stock.action_location_tree_3
 #: model:ir.ui.menu,name:stock.menu_action_location_tree_3
 msgid "Locations' Values"
-msgstr "Valeurs des Emplacements"
+msgstr ""
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
@@ -2551,4 +2588,3 @@ msgstr "STOCK_REDO"
 #: model:stock.location,name:stock.stock_location_locations
 msgid "Physical Locations"
 msgstr "Emplacements physiques"
-
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 2cdb9a22f13..7c533f3cc2c 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -798,9 +798,9 @@ class stock_production_lot(osv.osv):
 
         if isinstance(ids, (int, long)):
             ids = [ids]
-        
+
         res = {}.fromkeys(ids, 0.0)
-        
+
         if locations:
             cr.execute('''select
                     prodlot_id,
@@ -955,7 +955,12 @@ class stock_move(osv.osv):
             ['prodlot_id'])]
     def _default_location_destination(self, cr, uid, context={}):
         if context.get('move_line', []):
-            return context['move_line'][0][2] and context['move_line'][0][2]['location_dest_id'] or False
+            if context['move_line'][0]:
+                if isinstance(context['move_line'][0],(tuple,list)):
+                    return context['move_line'][0][2] and context['move_line'][0][2]['location_dest_id'] or False
+                else:
+                    move_list = self.pool.get('stock.move').read(cr, uid, context['move_line'][0],['location_dest_id'])
+                    return move_list and move_list['location_dest_id'][0] or False
         if context.get('address_out_id', False):
             return self.pool.get('res.partner.address').browse(cr, uid, context['address_out_id'], context).partner_id.property_stock_customer.id
         return False
@@ -981,7 +986,7 @@ class stock_move(osv.osv):
     }
 
     def _auto_init(self, cursor, context):
-        super(stock_move, self)._auto_init(cursor, context)
+        res = super(stock_move, self)._auto_init(cursor, context)
         cursor.execute('SELECT indexname \
                 FROM pg_indexes \
                 WHERE indexname = \'stock_move_location_id_location_dest_id_product_id_state\'')
@@ -989,12 +994,13 @@ class stock_move(osv.osv):
             cursor.execute('CREATE INDEX stock_move_location_id_location_dest_id_product_id_state \
                     ON stock_move (location_id, location_dest_id, product_id, state)')
             cursor.commit()
+        return res
 
     def onchange_lot_id(self, cr, uid, ids, prodlot_id=False, product_qty=False, loc_id=False, context=None):
         if not prodlot_id or not loc_id:
             return {}
         ctx = context and context.copy() or {}
-        ctx['location_id'] = loc_id 
+        ctx['location_id'] = loc_id
         prodlot = self.pool.get('stock.production.lot').browse(cr, uid, prodlot_id, ctx)
         location=self.pool.get('stock.location').browse(cr,uid,loc_id)
         warning={}
@@ -1005,7 +1011,7 @@ class stock_move(osv.osv):
             }
         return {'warning':warning}
 
-    def onchange_product_id(self, cr, uid, context, prod_id=False, loc_id=False, loc_dest_id=False):
+    def onchange_product_id(self, cr, uid, ids, prod_id=False, loc_id=False, loc_dest_id=False):
         if not prod_id:
             return {}
         product = self.pool.get('product.product').browse(cr, uid, [prod_id])[0]
@@ -1225,12 +1231,14 @@ class stock_move(osv.osv):
                                 move.product_id.categ_id.id,))
                 journal_id = move.product_id.categ_id.property_stock_journal.id
                 if acc_src != acc_dest:
-                    ref = move.picking_id and move.picking_id.name or False
-
+                    ref = move.picking_id and move.picking_id.name or False  
+                    product_uom_obj = self.pool.get('product.uom')
+                    default_uom = move.product_id.uom_id.id
+                    q = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
                     if move.product_id.cost_method == 'average' and move.price_unit:
-                        amount = move.product_qty * move.price_unit
+                        amount = q * move.price_unit
                     else:
-                        amount = move.product_qty * move.product_id.standard_price
+                        amount = q * move.product_id.standard_price
 
                     date = time.strftime('%Y-%m-%d')
                     partner_id = False
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c1a58bb23bd..17a0de03be6 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -343,7 +343,7 @@
                     <field name="usage" select="1"/>
                     <field name="account_id" select="1"/>
                     <field name="location_id"/>
-                    <field name="address_id" context="{'context_display':'partner'}"/>
+                    <field name="address_id" context="{'contact_display':'partner'}"/>
                     <field name="icon"/>
                     <newline/>
                     <group col="2" colspan="2">
@@ -422,7 +422,7 @@
                     <field name="lot_stock_id"/>
                     <field name="lot_output_id"/>
                     <newline/>
-                    <field name="partner_address_id" context="{'context_display':'partner'}"/>
+                    <field name="partner_address_id" context="{'contact_display':'partner'}"/>
                 </form>
             </field>
         </record>
@@ -436,7 +436,7 @@
                     <field name="lot_input_id"/>
                     <field name="lot_stock_id"/>
                     <field name="lot_output_id"/>
-                    <field name="partner_address_id" context="{'context_display':'partner'}"/>
+                    <field name="partner_address_id" context="{'contact_display':'partner'}"/>
                 </tree>
             </field>
         </record>
@@ -458,7 +458,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Move Lines">
-                    <field name="address_id" invisible="True" context="{'context_display':'partner'}"/>
+                    <field name="address_id" invisible="True" context="{'contact_display':'partner'}"/>
                     <field name="picking_id" invisible="True"/>
                     <field domain="[('picking_id','&lt;&gt;',picking_id),('state','in',['confirmed','assigned']),('picking_id.address_id','=',address_id)]" name="move_ids" nolabel="1"/><newline/>
                     <group colspan="4">
@@ -521,7 +521,7 @@
             <field name="arch" type="xml">
                 <form string="Packing list">
                     <group colspan="4" col="6">
-                        <field name="address_id" select="2" context="{'context_display':'partner'}"/>
+                        <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
                         <field name="type"/>
                         <field name="name" readonly="1"/>
                         <field name="date"/>
@@ -542,7 +542,7 @@
                                     <field colspan="4" invisible="1" name="name" select="1"/>
                                     <field invisible="1" name="date"/>
                                     <field name="date_planned"/>
-                                    <field name="address_id" select="1" context="{'context_display':'partner'}"/>
+                                    <field name="address_id" select="1" context="{'contact_display':'partner'}"/>
                                     <field groups="base.group_extended" name="product_packaging"/>
                                     <field name="prodlot_id" select="2"
                                         context="{'location_id':location_id, 'product_id':product_id}"
@@ -990,7 +990,7 @@
             <field name="arch" type="xml">
                 <form string="Input Packing List">
                     <group colspan="4" col="6">
-                        <field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'context_display':'partner'}"/>
+                        <field name="address_id" on_change="onchange_partner_in(address_id)" select="2" context="{'contact_display':'partner'}"/>
                         <field name="origin" select="2"/>
                         <field name="invoice_state" select="2" string="Invoice Control"/>
                         <field name="name" readonly="1" select="1"/>
@@ -1242,7 +1242,7 @@
                     <field name="date"/>
                     <field name="date_planned"/>
                     <field name="priority"/>
-                    <field name="address_id" select="2" context="{'context_display':'partner'}"/>
+                    <field name="address_id" select="2" context="{'contact_display':'partner'}"/>
                     <newline/>
                     <field name="picking_id" select="2"/>
                     <field name="prodlot_id" select="2"
diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py
index aea2a31d07a..2fe375c1b4f 100644
--- a/addons/stock/wizard/wizard_partial_picking.py
+++ b/addons/stock/wizard/wizard_partial_picking.py
@@ -47,7 +47,7 @@ def _to_xml(s):
 
 def _get_moves(self, cr, uid, data, context):
     pick_obj = pooler.get_pool(cr.dbname).get('stock.picking')
-    pick = pick_obj.browse(cr, uid, [data['id']])[0]
+    pick = pick_obj.browse(cr, uid, [data['id']], context)[0]
     res = {}
 
     _moves_fields.clear()
diff --git a/addons/stock_invoice_directly/i18n/fr_FR.po b/addons/stock_invoice_directly/i18n/fr_FR.po
index c69102db77f..d82cc4d42fb 100644
--- a/addons/stock_invoice_directly/i18n/fr_FR.po
+++ b/addons/stock_invoice_directly/i18n/fr_FR.po
@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-04-09 17:23+0000\n"
-"PO-Revision-Date: 2009-07-06 13:01+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-04-10 12:06+0000\n"
+"Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-07-06 13:12+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:21+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
-msgstr "Facture la livraison directement"
+msgstr ""
diff --git a/addons/stock_location/i18n/fr_FR.po b/addons/stock_location/i18n/fr_FR.po
index 60f124e302d..8a00c226dd4 100644
--- a/addons/stock_location/i18n/fr_FR.po
+++ b/addons/stock_location/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 14:13+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 14:40+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:23+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
diff --git a/addons/stock_no_autopicking/i18n/fr_FR.po b/addons/stock_no_autopicking/i18n/fr_FR.po
index 9f6150afc7a..131df093e1d 100644
--- a/addons/stock_no_autopicking/i18n/fr_FR.po
+++ b/addons/stock_no_autopicking/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.1\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-05-19 14:22:20+0000\n"
-"PO-Revision-Date: 2009-05-20 10:22:20+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-05-19 14:36+0000\n"
+"PO-Revision-Date: 2009-06-12 14:14+0000\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:21+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
 #: constraint:ir.ui.view:0
@@ -23,15 +24,15 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr ""
+msgstr "Colisage Automatique"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr "Colisage automatique pour les matériaux bruts des commandes de production."
+msgstr ""
+"Colisage automatique pour les matériaux bruts des commandes de production."
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr ""
-
+msgstr "Stock Sans Colisage Automatique"
diff --git a/addons/subscription/i18n/fr_FR.po b/addons/subscription/i18n/fr_FR.po
index 18ca907f421..2bffa8525b4 100644
--- a/addons/subscription/i18n/fr_FR.po
+++ b/addons/subscription/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 14:17+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 14:44+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
diff --git a/addons/warning/i18n/fr_FR.po b/addons/warning/i18n/fr_FR.po
index 6659ae23862..9ffe4f84986 100644
--- a/addons/warning/i18n/fr_FR.po
+++ b/addons/warning/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 14:01+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 14:36+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: warning
diff --git a/addons/wiki/i18n/fr_FR.po b/addons/wiki/i18n/fr_FR.po
index 792329d3777..f36377477e2 100644
--- a/addons/wiki/i18n/fr_FR.po
+++ b/addons/wiki/i18n/fr_FR.po
@@ -8,12 +8,12 @@ msgstr ""
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-05-19 14:36+0000\n"
 "PO-Revision-Date: 2009-06-12 13:53+0000\n"
-"Last-Translator: Olivier (OpenERP) <Unknown>\n"
+"Last-Translator: Olivier (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-06-12 14:20+0000\n"
+"X-Launchpad-Export-Date: 2009-07-07 11:19+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
author	Fabien Pinckaers <fp@tinyerp.com>	2009-08-03 09:01:56 +0200
committer	Fabien Pinckaers <fp@tinyerp.com>	2009-08-03 09:01:56 +0200
commit	5ebd3bc12cb0940d95dbfeb78e60e5a4ce174d06 (patch)
tree	fbbea591e5cd0659abc53f92d24adba143dc45f0 /addons
parent	3472508614e7ee985d8f87faf4e6a658d5bdca56 (diff)
parent	738dc7153439aa6a02a35a23449214265547e516 (diff)