[MERGE] sync with trunk

bzr revid: christophe@tinyerp.com-20090311134151-3n6g8bssfag6ln8f

106 files changed, 1939 insertions, 1141 deletions

diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 0dacc365fcc..084185a6462 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -531,6 +531,7 @@ class account_move_line(osv.osv):
 
     def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context={}):
         id_set = ','.join(map(str, ids))
+        
         lines = self.browse(cr, uid, ids, context=context)
         unrec_lines = filter(lambda x: not x['reconcile_id'], lines)
         credit = debit = 0.0
@@ -707,7 +708,6 @@ class account_move_line(osv.osv):
         return result
 
     def unlink(self, cr, uid, ids, context={}, check=True):
-        print "CC"
         self._update_check(cr, uid, ids, context)
         result = False
         for line in self.browse(cr, uid, ids, context):
diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml
index 07a6ac6eecc..4e44a44e6b8 100644
--- a/addons/account/account_wizard.xml
+++ b/addons/account/account_wizard.xml
@@ -109,10 +109,10 @@
         <wizard id="wizard_print_journal" menu="False" model="account.journal.period" name="account.print.journal.report" string="Print Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_print_journal" id="menu_print_journal" parent="account.menu_generic_report" type="wizard" />
 
-        <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Print Central journal" />
+        <wizard id="wizard_central_journal" menu="False" model="account.journal.period" name="account.central.journal.report" string="Print Central Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_central_journal" id="menu_central_journal" parent="account.menu_generic_report" type="wizard" />
 
-        <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General journal" />
+        <wizard id="wizard_general_journal" menu="False" model="account.journal.period" name="account.general.journal.report" string="Print General Journal" />
 		<menuitem icon="STOCK_PRINT" action="wizard_general_journal" id="menu_general_journal" parent="account.menu_generic_report" type="wizard" />
 
     </data>
diff --git a/addons/account/i18n/fr_FR.po b/addons/account/i18n/fr_FR.po
index daa4011b5e9..5ba4a6d8d3e 100644
--- a/addons/account/i18n/fr_FR.po
+++ b/addons/account/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-02-06 15:06:40+0000\n"
-"PO-Revision-Date: 2009-02-06 15:06:40+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-01-23 14:23+0000\n"
+"PO-Revision-Date: 2009-02-26 11:47+0000\n"
+"Last-Translator: Olivier (OpenERP) <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-02-26 11:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -32,37 +33,39 @@ msgid "Account Tax Code"
 msgstr "Code du compte taxe"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree9
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
-msgid "Unpaid Supplier Invoices"
-msgstr "Factures client en attente de règlement"
-
-#. module: account
-#: code:addons/account/wizard/wizard_open_closed_fiscalyear.py:0
-#, python-format
-msgid "No journal for ending writing has been defined for the fiscal year"
+#: help:account.tax,domain:0
+msgid ""
+"This field is only used if you develop your own module allowing developpers "
+"to create specific taxes in a custom domain."
 msgstr ""
+"Ce champ est uniquement utilisé si vous développez votre module afin de "
+"permettre aux développeur de créer des taxes spécifiques dans un domaine "
+"personnalisé."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Entries Encoding"
-msgstr ""
+msgstr "Saisie des écritures"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement from draft"
-msgstr ""
+msgstr "Confirmer l'état de brouillon"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset
 msgid "Asset"
-msgstr "Actifs"
+msgstr "Actif (avoirs)"
 
 #. module: account
 #: code:addons/account/wizard/wizard_validate_account_move.py:0
 #, python-format
-msgid "Specified Journal does not have any account move entries in draft state for this period"
-msgstr "Le Journal indiqué ne possède aucune écriture de compte à l'état brouillon pour cette période"
+msgid ""
+"Specified Journal does not have any account move entries in draft state for "
+"this period"
+msgstr ""
+"Le Journal indiqué ne possède aucune écriture de compte à l'état brouillon "
+"pour cette période"
 
 #. module: account
 #: wizard_view:account_use_models,init_form:0
@@ -145,9 +148,9 @@ msgid "Unreconcile entries"
 msgstr "Ecritures non-lettrées"
 
 #. module: account
-#: constraint:account.period:0
-msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr ""
+#: wizard_view:account_use_models,create:0
+msgid "Use Model"
+msgstr "Utiliser un modèle"
 
 #. module: account
 #: view:account.bank.statement.reconcile:0
@@ -171,13 +174,28 @@ msgstr "Confirmer les factures brouillon"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
-msgid "Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."
-msgstr "Jour du mois, saisir -1 pour le jour précédent du mois courant. Saisir 0 pour le jour courant ou saisir un chiffre positif pour le jour équivalent du mois prochain."
+msgid ""
+"Day of the month, set -1 for the last day of the current month. If it's "
+"positive, it gives the day of the next month. Set 0 for net days (otherwise "
+"it's based on the beginning of the month)."
+msgstr ""
+"Jour du mois, saisir -1 pour le jour précédent du mois courant. Saisir 0 "
+"pour le jour courant ou saisir un chiffre positif pour le jour équivalent du "
+"mois prochain."
 
 #. module: account
-#: view:account.move:0
-msgid "Total Credit"
-msgstr "Total crédit"
+#: help:account.account,currency_mode:0
+msgid ""
+"This will select how is computed the current currency rate for outgoing "
+"transactions. In most countries the legal method is \"average\" but only a "
+"few softwares are able to manage this. So if you import from another "
+"software, you may have to use the rate at date. Incoming transactions, "
+"always use the rate at date."
+msgstr ""
+"Vous sélectionnerez la méthode de calcul du taux de change de la devise pour "
+"les transactions ventes. Dans majorité des pays, la méthode légale est "
+"\"average\". Dans l'hypothèse d'un import depuis un autre logiciel ou des "
+"transactions achats, vous devrez sélectionner \"rate\"."
 
 #. module: account
 #: field:account.config.wizard,charts:0
@@ -196,12 +214,6 @@ msgid "Keep empty to use the expense account"
 msgstr "Laisser vide pour utiliser le compte de dépense"
 
 #. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "You can not modify a posted entry of this journal !\nYou should set the journal to allow cancelling entries if you want to do that."
-msgstr ""
-
-#. module: account
 #: rml:account.journal.period.print:0
 #: rml:account.tax.code.entries:0
 #: rml:account.third_party_ledger:0
@@ -283,13 +295,16 @@ msgstr "Écritures comptables-"
 
 #. module: account
 #: help:account.journal,view_id:0
-msgid "Gives the view used when writing or browsing entries in this journal. The view tell Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."
-msgstr "Indique la vue utilisée lors de la saisie ou de la recherche d'écritures dans ce journal. La vue précise les champs utilisés par le logiciel avec leurs propriétés. Vous pouvez créer votre propre vue pour accélérer votre saisie dans les journaux."
-
-#. module: account
-#: help:account.invoice,payment_term:0
-msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment. The payment term may compute several due dates, for example 50% now, 50% in one month."
+msgid ""
+"Gives the view used when writing or browsing entries in this journal. The "
+"view tell Open ERP which fields should be visible, required or readonly and "
+"in which order. You can create your own view for a faster encoding in each "
+"journal."
 msgstr ""
+"Indique la vue utilisée lors de la saisie ou de la recherche d'écritures "
+"dans ce journal. La vue précise les champs utilisés par le logiciel avec "
+"leurs propriétés. Vous pouvez créer votre propre vue pour accélérer votre "
+"saisie dans les journaux."
 
 #. module: account
 #: selection:account.tax,type:0
@@ -322,8 +337,12 @@ msgstr "Sélectionnez une période"
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
-msgid "Please verify the price of the invoice !\nThe real total does not match the computed total."
+msgid ""
+"Please verify the price of the invoice !\n"
+"The real total does not match the computed total."
 msgstr ""
+"Veuillez contrôlez les prix indiqués dans le document !\n"
+"Les montants indiqués ne correspondent pas avec les totaux calculés."
 
 #. module: account
 #: field:account.invoice,origin:0
@@ -364,9 +383,11 @@ msgid "Delta Debit"
 msgstr "Delta de débit"
 
 #. module: account
-#: field:account.chart.template,property_account_receivable:0
-msgid "Receivable Account"
-msgstr "Compte clients"
+#: rml:account.invoice:0
+#: field:account.invoice,amount_tax:0
+#: field:account.move.line,account_tax_id:0
+msgid "Tax"
+msgstr "Impôts et taxes"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
@@ -388,10 +409,9 @@ msgid "Analytic Account"
 msgstr "Centre de coûts"
 
 #. module: account
-#: field:account.tax,child_depend:0
-#: field:account.tax.template,child_depend:0
-msgid "Tax on Children"
-msgstr ""
+#: wizard_button:account.automatic.reconcile,reconcile,end:0
+msgid "OK"
+msgstr "OK"
 
 #. module: account
 #: rml:account.central.journal:0
@@ -422,6 +442,11 @@ msgid "Allow Cancelling Entries"
 msgstr "Autoriser l'annulation d'écriture"
 
 #. module: account
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximal quantity"
+msgstr "Quantité maximale"
+
+#. module: account
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 msgid "Payment Reconcilation"
@@ -454,8 +479,14 @@ msgstr "Ligne de mouvement"
 
 #. module: account
 #: rml:account.overdue:0
-msgid "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 departement at +32 81 81 37 00."
-msgstr "Dans le cas où votre paiement aurait été effectué après l'envoi de ce mail, veuillez considérer la présente comme nulle et non avenue. N'hésitez pas à contacter notre département comptabilité ou répondez à l'email."
+msgid ""
+"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 "
+"departement at +32 81 81 37 00."
+msgstr ""
+"Dans le cas où votre paiement aurait été effectué après l'envoi de ce mail, "
+"veuillez considérer la présente comme nulle et non avenue. N'hésitez pas à "
+"contacter notre département comptabilité ou répondez à l'email."
 
 #. module: account
 #: selection:account.move,type:0
@@ -473,10 +504,16 @@ msgid "State"
 msgstr "État"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree13
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
-msgid "Unpaid Supplier Refunds"
-msgstr "Avoirs fournisseurs en attente de déduction"
+#: help:account.tax,base_code_id:0
+#: help:account.tax,ref_base_code_id:0
+#: help:account.tax,ref_tax_code_id:0
+#: help:account.tax,tax_code_id:0
+#: help:account.tax.template,base_code_id:0
+#: help:account.tax.template,ref_base_code_id:0
+#: help:account.tax.template,ref_tax_code_id:0
+#: help:account.tax.template,tax_code_id:0
+msgid "Use this code for the VAT declaration."
+msgstr "Utilisez ce code pour la déclaration de TVA"
 
 #. module: account
 #: view:account.tax:0
@@ -487,7 +524,9 @@ msgstr "Calcul particulier"
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement with/without reconciliation from draft statement"
-msgstr "Veuillez confirmer le relevé d'opérations avec/sans rapprochement du relevé brouillon"
+msgstr ""
+"Veuillez confirmer le relevé d'opérations avec/sans rapprochement du relevé "
+"brouillon"
 
 #. module: account
 #: wizard_view:account.move.bank.reconcile,init:0
@@ -501,19 +540,13 @@ msgstr "Rapprochement bancaire"
 #: field:account.model,ref:0
 #: field:account.move,ref:0
 #: rml:account.overdue:0
-#: field:account.subscription,ref:0
 msgid "Ref"
 msgstr "Réf."
 
 #. module: account
-#: field:account.tax.template,type_tax_use:0
-msgid "Tax Use In"
-msgstr ""
-
-#. module: account
-#: help:account.tax.template,include_base_amount:0
-msgid "Set if the amount of tax must be included in the base amount before computing the next taxes."
-msgstr ""
+#: wizard_view:account.analytic.line,init:0
+msgid "View Account Analytic Lines"
+msgstr "Voir les lignes de compte analytique"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
@@ -564,9 +597,13 @@ msgid "Deferral Method"
 msgstr "Méthode de report à nouveau"
 
 #. module: account
-#: field:account.tax.template,include_base_amount:0
-msgid "Include in Base Amount"
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used, instead of the default one, for the current "
+"partner"
 msgstr ""
+"Cette condition de paiement sera utilisée, au lieu de celle par défaut, pour "
+"le partenaire courant"
 
 #. module: account
 #: field:account.tax,ref_base_code_id:0
@@ -580,11 +617,6 @@ msgid "Line"
 msgstr "Ligne"
 
 #. module: account
-#: rml:account.analytic.account.cost_ledger:0
-msgid "J.C. or Move name"
-msgstr ""
-
-#. module: account
 #: selection:account.tax,applicable_type:0
 #: selection:account.tax.template,applicable_type:0
 msgid "True"
@@ -592,8 +624,13 @@ msgstr "Vrai"
 
 #. module: account
 #: help:account.payment.term.line,days:0
-msgid "Number of days to add before computation of the day of month.If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."
-msgstr "Nombre de jours à ajouter avant calcul. Par exemple, si la date est le 15/01, le nombre de jours = 22, le jour du mois = -1, le résultat obtenu sera le 28/02"
+msgid ""
+"Number of days to add before computation of the day of month.If Date=15/01, "
+"Number of Days=22, Day of Month=-1, then the due date is 28/02."
+msgstr ""
+"Nombre de jours à ajouter avant calcul. Par exemple, si la date est le "
+"15/01, le nombre de jours = 22, le jour du mois = -1, le résultat obtenu "
+"sera le 28/02"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -604,7 +641,7 @@ msgstr "Taxes"
 #: code:addons/account/account.py:0
 #, python-format
 msgid "Bank Journal "
-msgstr ""
+msgstr "Journal de banque "
 
 #. module: account
 #: rml:account.central.journal:0
@@ -659,6 +696,12 @@ msgid "Contact"
 msgstr "Contact"
 
 #. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not validate a non balanced entry !"
+msgstr "Vous ne pouvez pas valider une écriture non équilibrée !"
+
+#. module: account
 #: selection:account.model.line,date:0
 #: selection:account.model.line,date_maturity:0
 msgid "Partner Payment Term"
@@ -688,19 +731,27 @@ msgstr "Vous ne pouvez pas ajouter/modifier un journal cloturé."
 #. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
-msgid "You can not do this modification on a reconciled entry ! Please note that you can just change some non important fields !"
+msgid ""
+"You can not do this modification on a reconciled entry ! Please note that "
+"you can just change some non important fields !"
 msgstr "Vous ne pouvez pas modifier une écriture lettrée ou rapprochée !"
 
 #. module: account
-#: wizard_field:account.move.line.reconcile,init_full,writeoff:0
-#: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
-msgid "Write-Off amount"
-msgstr "Montant de l'ajustement"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Global taxes defined, but not in invoice lines !"
+msgstr "Il semble manquer des taxes dans les lignes de factures !"
+
+#. module: account
+#: field:account.analytic.account,child_ids:0
+msgid "Childs Accounts"
+msgstr "Comptes enfants"
 
 #. module: account
 #: help:account.fiscalyear,company_id:0
 msgid "Keep empty if the fiscal year belongs to several companies."
-msgstr "Laissez ce champ vide pour pour une sélection de plusieurs entreprises."
+msgstr ""
+"Laissez ce champ vide pour pour une sélection de plusieurs entreprises."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_analytic_accounting
@@ -708,7 +759,6 @@ msgid "Analytic Accounting"
 msgstr "Comptabilité analytique"
 
 #. module: account
-#: field:account.analytic.account,line_ids:0
 #: view:account.analytic.line:0
 #: code:addons/account/project/wizard/wizard_account_analytic_line.py:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
@@ -718,6 +768,15 @@ msgid "Analytic Entries"
 msgstr "Ecritures analytiques"
 
 #. module: account
+#: help:product.category,property_account_expense_categ:0
+msgid ""
+"This account will be used, instead of the default one, to value outgoing "
+"stock for the current product category"
+msgstr ""
+"Ce compte sera utilisé, au lieu de celui par défaut, pour valoriser les "
+"sorties de marchandises pour la catégorie de produit courante"
+
+#. module: account
 #: rml:account.tax.code.entries:0
 msgid "Voucher Nb"
 msgstr "Numéro de pièce"
@@ -734,11 +793,6 @@ msgid "account.analytic.line.extended"
 msgstr "account.analytic.line.extended"
 
 #. module: account
-#: field:account.analytic.account,partner_id:0
-msgid "Associated Partner"
-msgstr ""
-
-#. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "You must first select a partner !"
@@ -747,7 +801,7 @@ msgstr "Vous devez d'abord sélectionner un partenaire !"
 #. module: account
 #: field:account.invoice,comment:0
 msgid "Additional Information"
-msgstr ""
+msgstr "Information complémentaire"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -755,9 +809,14 @@ msgid "Customer Refund"
 msgstr "Avoir client"
 
 #. module: account
+#: wizard_view:populate_statement_from_inv,init:0
+msgid "Import invoices in statement"
+msgstr "Importer les factures dans le relevé"
+
+#. module: account
 #: field:wizard.multi.charts.accounts,seq_journal:0
 msgid "Separated Journal Sequences"
-msgstr ""
+msgstr "Numérotation de Journaux Séparées"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -804,10 +863,22 @@ msgid "End of Year Entries Journal"
 msgstr "Journal des opérations de fin d'année"
 
 #. module: account
-#: view:product.product:0
-#: view:product.template:0
-msgid "Purchase Properties"
+#: help:res.partner,property_account_payable:0
+msgid ""
+"This account will be used, instead of the default one, as the payable "
+"account for the current partner"
 msgstr ""
+"Ce compte sera utilisé, au lieu de celui par défaut, comme le compte de "
+"paiement pour le partenaire courant"
+
+#. module: account
+#: help:account.move.line,amount_currency:0
+msgid ""
+"The amount expressed in an optionnal other currency if it is a multi-"
+"currency entry."
+msgstr ""
+"Le montant exprimé dans une autre devise optionnelle si c'est une entrée "
+"multi-devise."
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
@@ -835,6 +906,11 @@ msgid "Status"
 msgstr "État"
 
 #. module: account
+#: field:account.tax,child_ids:0
+msgid "Childs Tax Account"
+msgstr "Compte de taxe enfant"
+
+#. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Period to"
@@ -851,12 +927,10 @@ msgid "Generate entries before:"
 msgstr "Générer les écritures avant :"
 
 #. module: account
-#: rml:account.analytic.account.cost_ledger:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_cost_ledger_report
 msgid "Cost Ledger"
-msgstr "Livre de coûts"
+msgstr "Livre des charges"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -872,10 +946,17 @@ msgid "Move Lines"
 msgstr "Lignes de mouvements"
 
 #. module: account
+#: view:account.move:0
+msgid "Total Credit"
+msgstr "Total crédit"
+
+#. module: account
 #: code:addons/account/wizard/wizard_fiscalyear_close.py:0
 #, python-format
 msgid "The opening journal must not have any entry in the new fiscal year !"
-msgstr "Le journal d'ouverture ne doit pas contenir d'écritures dans le nouvel exercice fiscal !"
+msgstr ""
+"Le journal d'ouverture ne doit pas contenir d'écritures dans le nouvel "
+"exercice fiscal !"
 
 #. module: account
 #: model:ir.model,name:account.model_account_config_wizard
@@ -904,6 +985,12 @@ msgid "Templates for Accounts"
 msgstr "Modèles pour les comptes"
 
 #. module: account
+#: field:account.tax,type_tax_use:0
+#: field:account.tax.template,type_tax_use:0
+msgid "Tax Use in"
+msgstr "Taxe utilisé dans"
+
+#. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.model,name:account.model_account_analytic_account
 #: model:ir.ui.menu,name:account.account_analytic_def_account
@@ -911,11 +998,9 @@ msgid "Analytic Accounts"
 msgstr "Comptes analytiques"
 
 #. module: account
-#: wizard_view:account.print.journal.report,init:0
-#: model:ir.actions.wizard,name:account.wizard_print_journal
-#: model:ir.ui.menu,name:account.menu_print_journal
-msgid "Print Journal"
-msgstr "Journal détaillé par écriture"
+#: field:account.model,name:0
+msgid "Model Name"
+msgstr "Nom du modèle"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
@@ -945,11 +1030,6 @@ msgid "Expense Account"
 msgstr "Compte de dépenses"
 
 #. module: account
-#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
-msgid "Write-Off Journal"
-msgstr "Journal des pertes et profits"
-
-#. module: account
 #: field:account.model.line,amount_currency:0
 #: field:account.move.line,amount_currency:0
 msgid "Amount Currency"
@@ -966,11 +1046,6 @@ msgid "New Fiscal Year"
 msgstr "Nouvelle année fiscale"
 
 #. module: account
-#: help:account.tax,tax_group:0
-msgid "If a default tax is given in the partner it only overrides taxes from accounts (or products) in the same group."
-msgstr ""
-
-#. module: account
 #: wizard_field:account.open_closed_fiscalyear,init,fyear_id:0
 msgid "Fiscal Year to Open"
 msgstr "Année Fiscal à ouvrir"
@@ -1000,6 +1075,7 @@ msgstr "Date d'impression :"
 
 #. module: account
 #: wizard_field:account.account.balance.report,checktype,date_to:0
+#: field:account.fiscalyear,date_stop:0
 #: wizard_field:account.general.ledger.report,checktype,date_to:0
 #: wizard_field:account.partner.balance.report,init,date2:0
 #: wizard_field:account.third_party_ledger.report,init,date2:0
@@ -1012,9 +1088,9 @@ msgid "Base Code Amount"
 msgstr "Montant Hors Taxe"
 
 #. module: account
-#: help:account.journal,user_id:0
-msgid "The user responsible for this journal"
-msgstr ""
+#: field:account.account,child_id:0
+msgid "Children Accounts"
+msgstr "Comptes enfants"
 
 #. module: account
 #: field:account.journal,default_debit_account_id:0
@@ -1087,6 +1163,12 @@ msgid "UoM"
 msgstr "UdM"
 
 #. module: account
+#: view:product.product:0
+#: view:product.template:0
+msgid "Purchases Properties"
+msgstr "Propriétés des achats"
+
+#. module: account
 #: wizard_field:account.third_party_ledger.report,init,page_split:0
 msgid "One Partner Per Page"
 msgstr "Un partenaire par page"
@@ -1109,12 +1191,6 @@ msgid "New Supplier Invoice"
 msgstr "Nouvelle facture fournisseur"
 
 #. module: account
-#: code:addons/account/wizard/wizard_automatic_reconcile.py:0
-#, python-format
-msgid "You must select accounts to reconcile"
-msgstr ""
-
-#. module: account
 #: wizard_field:account.invoice.pay,init,amount:0
 msgid "Amount paid"
 msgstr "Montant payé"
@@ -1138,9 +1214,9 @@ msgid "Choose Fiscal Year"
 msgstr "Choisissez l'exercice fiscal"
 
 #. module: account
-#: field:account.sequence.fiscalyear,sequence_main_id:0
-msgid "Main Sequence"
-msgstr ""
+#: wizard_field:account.move.line.reconcile,addendum,journal_id:0
+msgid "Write-Off Journal"
+msgstr "Journal des pertes et profits"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_tree
@@ -1150,8 +1226,12 @@ msgstr "Imprimer les journaux analytiques"
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
-msgid "The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"
-msgstr "Le champ séquence est utilisé pour classer les lignes des conditions de paiement des plus basses séquences vers les plus hautes."
+msgid ""
+"The sequence field is used to order the payment term lines from the lowest "
+"sequences to the higher ones"
+msgstr ""
+"Le champ séquence est utilisé pour classer les lignes des conditions de "
+"paiement des plus basses séquences vers les plus hautes."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_new:0
@@ -1164,12 +1244,6 @@ msgid "Compute Code for Taxes included prices"
 msgstr "Code de calcul pour les taxes comprises"
 
 #. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "You can not validate a non-balanced entry !"
-msgstr ""
-
-#. module: account
 #: view:account.invoice.tax:0
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
@@ -1273,9 +1347,9 @@ msgid "Tel. :"
 msgstr "Tél. :"
 
 #. module: account
-#: help:account.account,currency_mode:0
-msgid "This will select how the current currency rate for outgoing transactions is computed. In most countries the legal method is \"average\" but only a few software systems are able to manage this. So if you import from another software system you may have to use the rate at date. Incoming transactions always use the rate at date."
-msgstr ""
+#: model:account.journal,name:account.expenses_journal
+msgid "x Expenses Journal"
+msgstr "x Journal des dépenses"
 
 #. module: account
 #: field:account.account,company_currency_id:0
@@ -1283,13 +1357,8 @@ msgid "Company Currency"
 msgstr "Devise société"
 
 #. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_account_template
-msgid "Fiscal Position Template Account Mapping"
-msgstr ""
-
-#. module: account
-#: field:account.analytic.account,parent_id:0
-msgid "Parent Analytic Account"
+#: rml:account.analytic.account.cost_ledger:0
+msgid "J.C. / Move name"
 msgstr ""
 
 #. module: account
@@ -1300,8 +1369,10 @@ msgstr "Lettrer avec un ajustement"
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
-msgid "The expected balance (%.2f) is different than the computed one. (%.2f)"
-msgstr "La balance affiché (%.2f) semble différente que celle calculée. (%.2f)"
+msgid ""
+"The expected balance (%.2f) is different than the computed one. (%.2f)"
+msgstr ""
+"La balance affiché (%.2f) semble différente que celle calculée. (%.2f)"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,code_digits:0
@@ -1324,6 +1395,12 @@ msgid "Line Name"
 msgstr "Nom de ligne"
 
 #. module: account
+#: model:ir.actions.act_window,name:account.action_invoice_tree2
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
+msgid "Supplier Invoices"
+msgstr "Factures fournisseur"
+
+#. module: account
 #: selection:account.payment.term.line,value:0
 msgid "Fixed Amount"
 msgstr "Montant fixe"
@@ -1331,7 +1408,7 @@ msgstr "Montant fixe"
 #. module: account
 #: rml:account.analytic.account.analytic.check:0
 msgid "Analytic Credit"
-msgstr ""
+msgstr "Crédit Analytique"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -1345,13 +1422,6 @@ msgid "Not reconciled transactions"
 msgstr "Transaction non-lettrée"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,tax_ids:0
-#: field:account.fiscal.position.template,tax_ids:0
-msgid "Tax Mapping"
-msgstr ""
-
-#. module: account
 #: view:account.config.wizard:0
 msgid "Continue"
 msgstr "Continuer"
@@ -1401,7 +1471,6 @@ msgstr "Vue"
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
 #: selection:account.general.ledger.report,checktype,display_account:0
-#: selection:account.tax,type_tax_use:0
 msgid "All"
 msgstr "Tous"
 
@@ -1412,21 +1481,27 @@ msgid "Analytic lines"
 msgstr "Lignes analytiques"
 
 #. module: account
-#: help:account.move.line,amount_currency:0
-msgid "The amount expressed in an optionnal other currency if it is a multi-currency entry."
-msgstr "Le montant exprimé dans une autre devise optionnelle si c'est une entrée multi-devise."
+#: help:account.tax,type:0
+msgid "The computation method for the tax amount."
+msgstr "Méthode de calcul du montant"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
-msgid "You can not do this modification on a confirmed entry ! Please note that you can just change some non important fields !"
+msgid ""
+"You can not do this modification on a confirmed entry ! Please note that you "
+"can just change some non important fields !"
 msgstr "Vous ne pouvez pas modifier une écriture validée."
 
 #. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
-msgid "If you unreconciliate transactions, you must also verify all the actions that are linked to those transactions because they will not be disable"
-msgstr "Si vous délettrez des écritures, vous devrez vérifier toutes les actions qui y sont liées."
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+"Si vous délettrez des écritures, vous devrez vérifier toutes les actions qui "
+"y sont liées."
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -1444,9 +1519,9 @@ msgid "Tax Lines"
 msgstr "Lignes de taxe"
 
 #. module: account
-#: field:ir.sequence,fiscal_ids:0
+#: field:account.journal,fy_seq_id:0
 msgid "Sequences"
-msgstr ""
+msgstr "Sequences"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_type_form
@@ -1455,12 +1530,6 @@ msgid "Account Types"
 msgstr "Types de compte"
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Cannot create invoice move on centralised journal"
-msgstr ""
-
-#. module: account
 #: wizard_field:account.automatic.reconcile,init,journal_id:0
 #: field:account.bank.statement,journal_id:0
 #: wizard_field:account.central.journal.report,init,journal_id:0
@@ -1483,10 +1552,12 @@ msgid "Journal"
 msgstr "Journal"
 
 #. module: account
-#: field:account.account,child_id:0
-#: field:account.analytic.account,child_ids:0
-msgid "Child Accounts"
-msgstr ""
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,tax_ids:0
+#: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,tax_ids:0
+msgid "Taxes Mapping"
+msgstr "Correspondance des taxes"
 
 #. module: account
 #: field:account.account,check_history:0
@@ -1516,6 +1587,11 @@ msgid "Keep empty to use the income account"
 msgstr "Laisser vide pour utiliser le compte de revenu"
 
 #. module: account
+#: field:account.payment.term.line,value_amount:0
+msgid "Value Amount"
+msgstr "Montant"
+
+#. module: account
 #: view:account.bank.statement.reconcile:0
 #: field:account.bank.statement.reconcile,line_new_ids:0
 #: wizard_view:account.move.line.reconcile,init_full:0
@@ -1539,9 +1615,14 @@ msgid "Close states"
 msgstr "Clôturer l'état"
 
 #. module: account
-#: wizard_view:account_use_models,create:0
-msgid "Use Model"
-msgstr "Utiliser un modèle"
+#: view:account.subscription:0
+msgid "Remove Lines"
+msgstr "Supprimer lignes"
+
+#. module: account
+#: field:account.invoice,address_contact_id:0
+msgid "Contact Address"
+msgstr "Adresse du contact"
 
 #. module: account
 #: rml:account.partner.balance:0
@@ -1575,6 +1656,11 @@ msgid "Print General Journal"
 msgstr "Imprimer le journal général"
 
 #. module: account
+#: help:account.period,special:0
+msgid "These periods can overlap."
+msgstr "Ces périodes ne peuvent se chevaucher."
+
+#. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
@@ -1586,6 +1672,11 @@ msgid "Invoice Movement"
 msgstr "Transactions"
 
 #. module: account
+#: view:account.journal:0
+msgid "Invoice Sequences"
+msgstr "Numérotation des factures"
+
+#. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 #: model:ir.ui.menu,name:account.menu_wizard
 #: view:wizard.multi.charts.accounts:0
@@ -1596,7 +1687,7 @@ msgstr "Générer le plan de comptes à partir d'un modèle"
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "The statement balance is incorrect !\n"
-msgstr ""
+msgstr "La balance est incorrecte !\n"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -1632,10 +1723,9 @@ msgid "Account n°"
 msgstr "Compte n°"
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Free Reference"
-msgstr "Référence libre"
+#: field:account.analytic.account,type:0
+msgid "Account type"
+msgstr "Type"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,init,account_ids:0
@@ -1686,6 +1776,14 @@ msgid "Close Period"
 msgstr "Clôturer la période"
 
 #. module: account
+#: code:addons/account/wizard/wizard_validate_account_move.py:0
+#, python-format
+msgid ""
+"Selected Move lines does not have any account move enties in draft state"
+msgstr ""
+"Sélectionner les lignes de mouvements qui ne peuvent être à l'état brouillon"
+
+#. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
 msgstr "Détail"
@@ -1712,6 +1810,12 @@ msgid "No Partner Defined !"
 msgstr "Pas de partenaire défini !"
 
 #. module: account
+#: field:account.tax,child_depend:0
+#: field:account.tax.template,child_depend:0
+msgid "Tax on Childs"
+msgstr "Dépend d'enfants"
+
+#. module: account
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,journal:0
 #: view:account.journal.period:0
 #: model:ir.actions.act_window,name:account.action_account_journal_period_tree
@@ -1720,9 +1824,15 @@ msgid "Journals"
 msgstr "Journaux"
 
 #. module: account
-#: rml:account.analytic.account.quantity_cost_ledger:0
-msgid "Max Qty:"
-msgstr ""
+#: code:addons/account/account.py:0
+#: code:addons/account/account_move_line.py:0
+#: code:addons/account/invoice.py:0
+#: code:addons/account/wizard/wizard_fiscalyear_close.py:0
+#: code:addons/account/wizard/wizard_fiscalyear_close_state.py:0
+#: code:addons/account/wizard/wizard_journal.py:0
+#, python-format
+msgid "UserError"
+msgstr "ErreurUtilisateur"
 
 #. module: account
 #: wizard_button:account.invoice.refund,init,refund:0
@@ -1778,6 +1888,7 @@ msgstr "Etes vous sûr de vouloir saisir des écritures ?"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
+#: field:account.tax.template,include_base_amount:0
 msgid "Include in base amount"
 msgstr "Inclus dans le montant"
 
@@ -1803,15 +1914,9 @@ msgid "Cost Legder for period"
 msgstr "Grand livre par période"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
-#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
-msgid "New Statement"
-msgstr "Nouvelle déclaration"
-
-#. module: account
-#: wizard_field:account.analytic.line,init,from_date:0
-msgid "From"
-msgstr "Période du"
+#: model:ir.model,name:account.model_account_fiscal_position_tax_template
+msgid "Fiscal Position Template Taxes Mapping"
+msgstr "Modèle de position fiscale avec l'imputation des taxes"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
@@ -1825,16 +1930,15 @@ msgid "Print Central Journal"
 msgstr "Journal regroupé par compte"
 
 #. module: account
-#: wizard_field:account.aged.trial.balance,init,period_length:0
-msgid "Period length (days)"
-msgstr "Durée d'une période (jours)"
+#: field:account.analytic.account,code:0
+msgid "Account code"
+msgstr "Code du compte"
 
 #. module: account
-#: rml:account.invoice:0
-#: field:account.invoice,amount_tax:0
-#: field:account.move.line,account_tax_id:0
-msgid "Tax"
-msgstr "Impôts et taxes"
+#: code:addons/account/account_move_line.py:0
+#, python-format
+msgid "You can not use an inactive account!"
+msgstr "Vous ne pouvez pas utiliser un compte inactif!"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -1864,13 +1968,12 @@ msgstr "Suivant"
 
 #. module: account
 #: help:res.partner,property_account_position:0
-msgid "The fiscal position will determine taxes and the accounts used for the the partner."
-msgstr "La position fiscale déterminera les taxes et les comptes utilisés pour le partenaire."
-
-#. module: account
-#: rml:account.analytic.account.cost_ledger:0
-msgid "Date or Code"
+msgid ""
+"The fiscal position will determine taxes and the accounts used for the the "
+"partner."
 msgstr ""
+"La position fiscale déterminera les taxes et les comptes utilisés pour le "
+"partenaire."
 
 #. module: account
 #: field:account.analytic.account,user_id:0
@@ -1890,9 +1993,9 @@ msgid "Debit amount"
 msgstr "Montant Débit"
 
 #. module: account
-#: selection:account.subscription,period_type:0
-msgid "year"
-msgstr "Année"
+#: help:account.invoice,residual:0
+msgid "Remaining amount due."
+msgstr "Montant Restant Dû"
 
 #. module: account
 #: wizard_button:account.account.balance.report,checktype,report:0
@@ -1912,9 +2015,10 @@ msgid "Print"
 msgstr "Imprimer"
 
 #. module: account
-#: wizard_field:account.account.balance.report,checktype,date_from:0
-msgid "Start date"
-msgstr "Date de début"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Cannot delete invoice(s) which are already opened or paid !"
+msgstr "Vous ne pouvez effacer une facture ouverte ou réglée !"
 
 #. module: account
 #: model:account.journal,name:account.refund_expenses_journal
@@ -1933,6 +2037,11 @@ msgid "Type"
 msgstr "Type"
 
 #. module: account
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic entries"
+msgstr "Écritures analytiques"
+
+#. module: account
 #: view:account.journal:0
 msgid "Accounts Allowed (empty for no control)"
 msgstr "Comptes autorisés"
@@ -1960,6 +2069,11 @@ msgid "Pay invoice"
 msgstr "Payer la facture"
 
 #. module: account
+#: help:res.partner,debit:0
+msgid "Total amount you have to pay to this supplier."
+msgstr "Montant total à payer au fournisseur."
+
+#. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree5
 #: model:ir.ui.menu,name:account.menu_invoice_draft
 msgid "Draft Customer Invoices"
@@ -1989,12 +2103,6 @@ msgid "The partner reference of this invoice."
 msgstr "La référence partenaire sur la facture."
 
 #. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Cannot delete invoice(s) that are already opened or paid !"
-msgstr ""
-
-#. module: account
 #: wizard_field:account.general.ledger.report,checktype,sortbydate:0
 msgid "Sort by:"
 msgstr "Trier par :"
@@ -2005,9 +2113,9 @@ msgid "To Be Verified"
 msgstr "Doit être contrôlé"
 
 #. module: account
-#: help:res.partner,debit:0
-msgid "Total amount you have to pay to this supplier."
-msgstr "Montant total à payer au fournisseur."
+#: help:res.partner,credit:0
+msgid "Total amount this customer owns you."
+msgstr "Le montant total dû par ce client"
 
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
@@ -2036,11 +2144,6 @@ msgid "Account charts"
 msgstr "Plan de compte"
 
 #. module: account
-#: help:account.tax,name:0
-msgid "This name will be displayed on reports"
-msgstr ""
-
-#. module: account
 #: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
@@ -2084,17 +2187,18 @@ msgid "Journal-Period Name"
 msgstr "Nom de la période du journal"
 
 #. module: account
+#: code:addons/account/wizard/wizard_fiscalyear_close.py:0
+#, python-format
+msgid "There are no periods defined on New Fiscal Year."
+msgstr "Il n'y a pas de période définie sur la nouvelle année fiscale"
+
+#. module: account
 #: field:account.tax.code,name:0
 #: field:account.tax.code.template,name:0
 msgid "Tax Case Name"
 msgstr "Case de la déclaration fiscale"
 
 #. module: account
-#: help:account.journal,entry_posted:0
-msgid "Check this box if you don't want new account moves to pass through the 'draft' state and instead goes directly to the 'posted state' without any manual validation."
-msgstr ""
-
-#. module: account
 #: field:account.bank.statement.line,partner_id:0
 #: field:account.bank.statement.reconcile,partner_id:0
 #: rml:account.general.ledger:0
@@ -2107,13 +2211,17 @@ msgstr "Partenaire"
 
 #. module: account
 #: help:account.invoice,number:0
-msgid "Unique number of the invoice, computed automatically when the invoice is created."
+msgid ""
+"Unique number of the invoice, computed automatically when the invoice is "
+"created."
 msgstr ""
+"Numéro unique de la facture, calculé automatiquement lorsque la facture est "
+"créée."
 
 #. module: account
-#: rml:account.invoice:0
-msgid "Draft Invoice"
-msgstr ""
+#: field:account.analytic.account,partner_id:0
+msgid "Associated partner"
+msgstr "Partenaire associé"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense
@@ -2121,11 +2229,6 @@ msgid "Expense"
 msgstr "Charges"
 
 #. module: account
-#: field:account.journal,invoice_sequence_id:0
-msgid "Invoice Sequence"
-msgstr ""
-
-#. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
 msgstr "Réglages"
@@ -2158,6 +2261,17 @@ msgid "days"
 msgstr "Jours"
 
 #. module: account
+#: help:account.tax.template,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from the lowest "
+"sequences to the higher ones. The order is important if you have a tax that "
+"have several tax children. In this case, the evaluation order is important."
+msgstr ""
+"Le Champ 'Séquence' est utilisé pour trier les lignes de taxes du plus petit "
+"numéro de séquence au plus grand. L'ordre est important si vous avez "
+"plusieurs taxes enfant. Dans ce cas, l'ordre d'évaluation est important."
+
+#. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
 msgstr "Passée"
@@ -2204,6 +2318,11 @@ msgid "Computation"
 msgstr "Calcul"
 
 #. module: account
+#: field:account.analytic.account,parent_id:0
+msgid "Parent analytic account"
+msgstr "Centre de coût parent"
+
+#. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
 msgstr "Ecriture analytique"
@@ -2221,9 +2340,16 @@ msgid "Chart of Taxes"
 msgstr "Plan de taxes"
 
 #. module: account
-#: field:account.payment.term.line,value_amount:0
-msgid "Value Amount"
-msgstr "Montant"
+#: help:account.tax,sequence:0
+msgid ""
+"The sequence field is used to order the taxes lines from the lowest "
+"sequences to the higher ones. The order is important if you have a tax that "
+"have several tax childs. In this case, the evaluation order is important."
+msgstr ""
+"Le champ sequence est utilisé pour classer les lignes de taxes  des plus "
+"basses séquences vers les plus hautes. l'ordre est important si vous avez "
+"une taxe qui a plusieurs taxes enfants. Dans ce cas, l'ordre d'évaluation "
+"est important."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
@@ -2231,9 +2357,15 @@ msgid "Reconciled entries"
 msgstr "Ecritures lettrées"
 
 #. module: account
-#: field:account.invoice,address_contact_id:0
-msgid "Contact Address"
-msgstr "Adresse du contact"
+#: help:account.journal,entry_posted:0
+msgid ""
+"Check this box if you don't want that new account moves pass through the "
+"'draft' state and goes direclty to the 'posted state' without any manual "
+"validation."
+msgstr ""
+"Cochez cette case si vous ne voulez pas que les nouveaux mouvements de "
+"comptes passent par l'état 'Brouillon' et se retrouvent directement dans "
+"l'état 'Transféré' sans validation manuelle."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -2273,11 +2405,6 @@ msgid "Root Account"
 msgstr "Compte racine"
 
 #. module: account
-#: help:account.model.line,sequence:0
-msgid "The sequence field is used to order the resources from lower sequences to higher ones"
-msgstr ""
-
-#. module: account
 #: code:addons/account/account_bank_statement.py:0
 #, python-format
 msgid "Configration Error !"
@@ -2285,8 +2412,14 @@ msgstr "Erreur de configuration !"
 
 #. module: account
 #: rml:account.overdue:0
-msgid "Exception made of a mistake of our side, it seems that the following bills stay unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days."
-msgstr "Sauf erreur de notre part, il semble que les factures suivantes demeurent impayées. Nous vous prions de prendre les mesures nécessaires afin de procéder au règlement sous huitaine."
+msgid ""
+"Exception made of a mistake of our side, it seems that the following bills "
+"stay unpaid. Please, take appropriate measures in order to carry out this "
+"payment in the next 8 days."
+msgstr ""
+"Sauf erreur de notre part, il semble que les factures suivantes demeurent "
+"impayées. Nous vous prions de prendre les mesures nécessaires afin de "
+"procéder au règlement sous huitaine."
 
 #. module: account
 #: rml:account.invoice:0
@@ -2370,16 +2503,6 @@ msgid "2"
 msgstr "2"
 
 #. module: account
-#: wizard_view:account.chart,init:0
-msgid "(If you do not select Fiscal year it will take all open fiscal years)"
-msgstr ""
-
-#. module: account
-#: help:account.invoice.tax,base_code_id:0
-msgid "The account basis of the tax declaration."
-msgstr ""
-
-#. module: account
 #: rml:account.analytic.account.journal:0
 #: field:account.analytic.line,date:0
 #: field:account.bank.statement,date:0
@@ -2401,8 +2524,12 @@ msgstr "Date"
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
-msgid "No period defined for this date !\nPlease create a fiscal year."
+msgid ""
+"No period defined for this date !\n"
+"Please create a fiscal year."
 msgstr ""
+"Pas de période définit pour cette date !\n"
+"Veuillez créer une année fiscale."
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -2487,9 +2614,10 @@ msgid "Account No."
 msgstr "Compte n°."
 
 #. module: account
-#: help:account.tax,child_depend:0
-msgid "Set if the tax computation is based on the computation of child taxes rather than on the total amount."
-msgstr ""
+#: selection:account.analytic.journal,type:0
+#: selection:account.journal,type:0
+msgid "Situation"
+msgstr "Situation"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -2502,11 +2630,6 @@ msgid "Journal Code"
 msgstr "Code du journal"
 
 #. module: account
-#: help:account.tax,applicable_type:0
-msgid "If not applicable (computed through a Python code), the tax won't appear on the invoice."
-msgstr ""
-
-#. module: account
 #: field:account.model,lines_id:0
 msgid "Model Entries"
 msgstr "Modèle d'écritures"
@@ -2518,12 +2641,10 @@ msgstr "Date de fin"
 
 #. module: account
 #: view:account.bank.statement:0
-#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.action_move_line_search
-#: model:ir.actions.act_window,name:account.action_move_line_tree1
 #: model:ir.ui.menu,name:account.menu_action_move_line_search
 msgid "Entry Lines"
-msgstr "Écritures"
+msgstr "Lignes d'écriture"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_central_journal
@@ -2594,11 +2715,6 @@ msgid "Information addendum"
 msgstr "Informations supplémentaires"
 
 #. module: account
-#: help:account.tax,type:0
-msgid "The computation method for the tax amount."
-msgstr "Méthode de calcul du montant"
-
-#. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Entries Reconcile"
@@ -2663,23 +2779,20 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #. module: account
+#: help:account.account.type,sign:0
+msgid ""
+"Allows to change the displayed amount of the balance in the reports, in "
+"order to see positive results instead of negative ones in expenses accounts."
+msgstr ""
+"Autorise à modifier le mode d'affichage des montants dans la balance "
+"(exemple : valeur absolue sur les comptes de charges)."
+
+#. module: account
 #: field:account.account.type,name:0
 msgid "Acc. Type Name"
 msgstr "Intitulé"
 
 #. module: account
-#: help:account.tax,base_code_id:0
-#: help:account.tax,ref_base_code_id:0
-#: help:account.tax,ref_tax_code_id:0
-#: help:account.tax,tax_code_id:0
-#: help:account.tax.template,base_code_id:0
-#: help:account.tax.template,ref_base_code_id:0
-#: help:account.tax.template,ref_tax_code_id:0
-#: help:account.tax.template,tax_code_id:0
-msgid "Use this code for the VAT declaration."
-msgstr "Utilisez ce code pour la déclaration de TVA"
-
-#. module: account
 #: field:account.move.line,blocked:0
 msgid "Litigation"
 msgstr "Litige"
@@ -2707,9 +2820,9 @@ msgid "Account Payable"
 msgstr "Compte de fournisseur"
 
 #. module: account
-#: wizard_view:populate_statement_from_inv,init:0
-msgid "Import Invoices in Statement"
-msgstr ""
+#: wizard_view:account.move.validate,init:0
+msgid "Select Period and Journal for Validation"
+msgstr "Sélectionnez la période et le journal pour la validation"
 
 #. module: account
 #: view:account.invoice:0
@@ -2722,16 +2835,16 @@ msgid "Default Credit Account"
 msgstr "Compte de crédit par défaut"
 
 #. module: account
+#: help:account.journal,user_id:0
+msgid "The responsible user of this journal"
+msgstr "L'utilisateur résponsable de ce journal"
+
+#. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
 msgstr "Ordre de Paiement"
 
 #. module: account
-#: help:account.account.template,reconcile:0
-msgid "Check this option if you want the user to reconcile entries in this account."
-msgstr ""
-
-#. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Already Reconciled"
@@ -2771,10 +2884,14 @@ msgid "In dispute"
 msgstr "En litige"
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
-#, python-format
-msgid "Unable to change tax !"
+#: help:account.tax.code,notprintable:0
+#: help:account.tax.code.template,notprintable:0
+msgid ""
+"Check this box if you don't want that any vat related to this Tax Code "
+"appears on invoices"
 msgstr ""
+"Cochez cette case si vous désirez que toute TVA liée à ce Code de Taxe "
+"apparaise sur les factures"
 
 #. module: account
 #: rml:account.overdue:0
@@ -2816,34 +2933,30 @@ msgid "Analytic Chart of Accounts"
 msgstr "Plan de comptes analytiques"
 
 #. module: account
-#: wizard_view:account.analytic.line,init:0
-msgid "View Account Analytic Lines"
-msgstr "Voir les lignes de compte analytique"
-
-#. module: account
-#: wizard_view:account.move.validate,init:0
-msgid "Select Period and Journal for Validation"
-msgstr "Sélectionnez la période et le journal pour la validation"
-
-#. module: account
 #: field:account.invoice,number:0
 msgid "Invoice Number"
 msgstr "Numéro de facture"
 
 #. module: account
-#: field:account.period,date_stop:0
-msgid "End of Period"
-msgstr ""
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "You have to define an analytic journal of type '%s' !"
+msgstr "Vous devez définir un journal analytique du type'%s' !"
 
 #. module: account
-#: wizard_button:populate_statement_from_inv,go,finish:0
-msgid "O_k"
-msgstr ""
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: field:account.invoice,amount_total:0
+#: field:account.invoice,check_total:0
+msgid "Total"
+msgstr "Total"
 
 #. module: account
-#: field:account.invoice,amount_untaxed:0
-msgid "Untaxed"
-msgstr ""
+#: wizard_button:populate_statement_from_inv,go,finish:0
+msgid "O_k"
+msgstr "O_k"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_inverted_balance
@@ -2885,12 +2998,12 @@ msgstr "Mouvements des lettrages"
 #. module: account
 #: wizard_field:account.aged.trial.balance,init,direction_selection:0
 msgid "Analysis Direction"
-msgstr ""
+msgstr "Direction d'Analyse"
 
 #. module: account
 #: wizard_button:populate_statement_from_inv,init,go:0
 msgid "_Go"
-msgstr ""
+msgstr "_Commencer"
 
 #. module: account
 #: field:res.partner,ref_companies:0
@@ -2903,11 +3016,6 @@ msgid "Effective date"
 msgstr "Date"
 
 #. module: account
-#: help:account.tax.template,sequence:0
-msgid "The sequence field is used to order the taxes lines from lower sequences to higher ones. The order is important if you have a tax that has several tax children. In this case, the evaluation order is important."
-msgstr ""
-
-#. module: account
 #: field:account.journal.column,view_id:0
 #: view:account.journal.view:0
 #: field:account.journal.view,name:0
@@ -2949,9 +3057,22 @@ msgid "New Customer Invoice"
 msgstr "Nouvelle facture client"
 
 #. module: account
+#: help:account.journal,centralisation:0
+msgid ""
+"Check this box if you want that each entry doesn't create a counterpart but "
+"share the same counterpart for each entry of this journal. This is used in "
+"fiscal year closing."
+msgstr ""
+"Cochez cette case si vous souhaitez que chaque écriture soit regroupée dans "
+"une contrepartie unique. Fonctionnalité utilisée lors de la clôture de "
+"l'exercice fiscal."
+
+#. module: account
 #: rml:account.overdue:0
 msgid "Best regards."
-msgstr "Nous vous prions d'agréer, Madame, Monsieur, l'expression de nos sentiments distingués."
+msgstr ""
+"Nous vous prions d'agréer, Madame, Monsieur, l'expression de nos sentiments "
+"distingués."
 
 #. module: account
 #: model:ir.model,name:account.model_report_hr_timesheet_invoice_journal
@@ -2969,9 +3090,9 @@ msgid "Open State"
 msgstr "État Ouvert"
 
 #. module: account
-#: field:account.journal,entry_posted:0
-msgid "Skip 'Draft' State for Created Entries"
-msgstr "Omettre l'état 'Brouillon' pour les Entrées Créées"
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Max.qty:"
+msgstr "Qté Max."
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:0
@@ -2985,16 +3106,19 @@ msgid "From statement, create entries"
 msgstr "Depuis le relevé, créer des entrées"
 
 #. module: account
-#: field:account.analytic.account,complete_name:0
-msgid "Full Account Name"
-msgstr ""
+#: code:addons/account/account.py:0
+#, python-format
+msgid "You can not delete posted movement: \"%s\"!"
+msgstr "Vous ne pouvez pas effacer de mouvement posté: \"%s\" !"
 
 #. module: account
 #: rml:account.account.balance:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.inverted.balance:0
 #: rml:account.analytic.account.journal:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
 #: rml:account.general.ledger:0
 #: rml:account.journal.period.print:0
 #: rml:account.partner.balance:0
@@ -3016,11 +3140,6 @@ msgid "Accounting Statement"
 msgstr "Relevé de compte"
 
 #. module: account
-#: help:product.category,property_account_income_categ:0
-msgid "This account will be used to value incoming stock for the current product category"
-msgstr ""
-
-#. module: account
 #: view:product.product:0
 #: view:product.template:0
 #: view:res.partner:0
@@ -3040,11 +3159,6 @@ msgid "Please set an analytic journal on this financial journal !"
 msgstr "Veuillez mettre un journal analytique sur ce journal financier !"
 
 #. module: account
-#: view:account.fiscal.position.template:0
-msgid "Taxes Mapping"
-msgstr "Correspondance des taxes"
-
-#. module: account
 #: wizard_view:account.move.line.unreconcile,init:0
 #: wizard_view:account.reconcile.unreconcile,init:0
 msgid "Unreconciliation transactions"
@@ -3058,6 +3172,7 @@ msgstr "Lettrer les écritures depuis l'ordre de règlement."
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
+#: field:account.move.reconcile,line_id:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_move_line
 #: model:ir.model,name:account.model_account_move_line
 msgid "Entry lines"
@@ -3109,7 +3224,7 @@ msgstr "Débit analytique"
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "Taux de Change Sortant"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree10
@@ -3130,14 +3245,28 @@ msgstr "Lecture seule"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
-msgid "The maturity date of the generated entries for this model. You can chosse 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'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."
+msgid ""
+"The maturity date of the generated entries for this model. You can chosse "
+"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'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
-#: selection:account.analytic.journal,type:0
-#: selection:account.journal,type:0
-msgid "Situation"
-msgstr "Situation"
+#: constraint:account.fiscalyear:0
+msgid "Error ! The date duration of the Fiscal Year is invalid. "
+msgstr "Erreur ! La durée de l'exercice fiscal est incorrecte. "
+
+#. module: account
+#: help:product.template,property_account_income:0
+msgid ""
+"This account will be used, instead of the default one, to value incoming "
+"stock for the current product"
+msgstr ""
+"Ce compte sera utilisé , au lieu de celui par défaut, pour valoriser le "
+"stock d'entrée pour le produit courant"
 
 #. module: account
 #: rml:account.invoice:0
@@ -3157,14 +3286,18 @@ msgid "Unit of Measure"
 msgstr "Unité de mesure"
 
 #. module: account
-#: rml:account.analytic.account.journal:0
-msgid "Move name"
-msgstr "Nom du mouvement"
+#: field:account.chart.template,property_account_receivable:0
+msgid "Receivable Account"
+msgstr "Compte clients"
 
 #. module: account
-#: help:account.journal,group_invoice_lines:0
-msgid "If this box is checked, the system will try to group the accounting lines when generating them from invoices."
+#: constraint:account.period:0
+msgid ""
+"Invalid period ! Some periods overlap or the date duration is not in the "
+"limit of the fiscal year. "
 msgstr ""
+"Période invalide ! Les dates semblent se chevaucher avec les bornes de "
+"l'exercice fiscal. "
 
 #. module: account
 #: wizard_field:account.move.line.reconcile,init_full,trans_nbr:0
@@ -3205,7 +3338,8 @@ msgstr "("
 #: code:addons/account/account.py:0
 #, python-format
 msgid "You can not modify/delete a journal with entries for this period !"
-msgstr "Vous ne pouvez pas modifier un journal avec des écritures sur cette période !"
+msgstr ""
+"Vous ne pouvez pas modifier un journal avec des écritures sur cette période !"
 
 #. module: account
 #: view:account.invoice:0
@@ -3234,9 +3368,9 @@ msgid "Base"
 msgstr "Base de calcul"
 
 #. module: account
-#: field:account.model,name:0
-msgid "Model Name"
-msgstr "Nom du modèle"
+#: field:account.analytic.account,name:0
+msgid "Account name"
+msgstr "Nom du compte"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3291,6 +3425,19 @@ msgid "Account"
 msgstr "Compte"
 
 #. module: account
+#: help:account.invoice,payment_term:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment. The payment term may compute several "
+"due dates: 50% now, 50% in one month."
+msgstr ""
+"Si vous utilisez les conditions de règlement, la date sera automatiquement "
+"calculé pour les écritures et mouvements dans les journaux comptables. Si "
+"vous conservez les mêmes conditions et la date vide, cela correspond à un "
+"règlement direct."
+
+#. module: account
 #: selection:account.account.balance.report,checktype,state:0
 #: selection:account.general.ledger.report,checktype,state:0
 #: selection:account.partner.balance.report,init,state:0
@@ -3310,8 +3457,11 @@ msgstr "Notes"
 
 #. module: account
 #: help:account.invoice,reconciled:0
-msgid "The account moves of the invoice have been reconciled with account moves of the payment(s)."
-msgstr "Les mouvements générés par cette facture ont fait l'objet d'un lettrage."
+msgid ""
+"The account moves of the invoice have been reconciled with account moves of "
+"the payment(s)."
+msgstr ""
+"Les mouvements générés par cette facture ont fait l'objet d'un lettrage."
 
 #. module: account
 #: rml:account.invoice:0
@@ -3447,7 +3597,7 @@ msgstr "Le montant dans la devise du journal"
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr ""
+msgstr "Pas imprimable dans la facture"
 
 #. module: account
 #: field:account.move.line,move_id:0
@@ -3472,10 +3622,13 @@ msgid "Total debit"
 msgstr "Total débit"
 
 #. module: account
-#: code:addons/account/account_move_line.py:0
-#, python-format
-msgid "You can not change the tax, you should remove and recreate lines !"
+#: help:account.journal,group_invoice_lines:0
+msgid ""
+"If this box is cheked, the system will try to group the accouting lines when "
+"generating them from invoices."
 msgstr ""
+"Si cette case est cochée, le système tente de regrouper les lignes de "
+"comptes lorsque qu'elle proviennent des factures."
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -3485,8 +3638,12 @@ msgstr "En suspend"
 #. module: account
 #: code:addons/account/wizard/wizard_bank_reconcile.py:0
 #, python-format
-msgid "You have to define the bank account\nin the journal definition for reconciliation."
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
 msgstr ""
+"Vous devez définir le compte bancaire\n"
+"dans la définition du journal pour la réconciliation."
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -3518,11 +3675,6 @@ msgid "Third Party Ledger"
 msgstr "Journal des tiers"
 
 #. module: account
-#: help:res.partner,property_account_receivable:0
-msgid "This account will be used instead of the default one as the receivable account for the current partner"
-msgstr ""
-
-#. module: account
 #: rml:account.vat.declaration:0
 msgid "Solde"
 msgstr "Solde"
@@ -3538,9 +3690,14 @@ msgid "Partner Accounts"
 msgstr "Compte tiers"
 
 #. module: account
+#: help:account.tax,tax_group:0
 #: help:account.tax.template,tax_group:0
-msgid "If a default tax if given in the partner it only override taxes from account (or product) of the same group."
-msgstr "Si une taxe par défaut est précisée pour le partenaire cela ne surcharge seulement que les taxes pour le compte (ou le produit) du même groupe."
+msgid ""
+"If a default tax if given in the partner it only override taxes from account "
+"(or product) of the same group."
+msgstr ""
+"Si une taxe par défaut est précisée pour le partenaire cela ne surcharge "
+"seulement que les taxes pour le compte (ou le produit) du même groupe."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3572,12 +3729,19 @@ msgstr "Ligne de facture"
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 msgid "Force all moves for this account to have this secondary currency."
-msgstr "Force tous les mouvements pour ce compte à disposer de cette devise secondaire."
+msgstr ""
+"Force tous les mouvements pour ce compte à disposer de cette devise "
+"secondaire."
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
-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 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."
+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 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."
 
 #. module: account
 #: selection:account.model.line,date:0
@@ -3586,6 +3750,15 @@ msgid "Date of the day"
 msgstr "Date du jour"
 
 #. module: account
+#: help:account.model.line,sequence:0
+msgid ""
+"The sequence field is used to order the resources from the lowest sequences "
+"to the higher ones"
+msgstr ""
+"Le champ séquence est utilisé pour ordonner les documents de la plus petit "
+"vers la plus grand"
+
+#. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
@@ -3595,7 +3768,6 @@ msgstr "Compte de taxe parent"
 #: field:account.account,user_type:0
 #: field:account.account.template,user_type:0
 #: view:account.account.type:0
-#: field:account.analytic.account,type:0
 #: model:ir.model,name:account.model_account_account_type
 msgid "Account Type"
 msgstr "Type de compte"
@@ -3624,7 +3796,6 @@ msgid "Pay and reconcile"
 msgstr "Payer et lettrer"
 
 #. module: account
-#: rml:account.central.journal:0
 #: model:ir.actions.report.xml,name:account.account_central_journal
 msgid "Central Journal"
 msgstr "Journal centralisé"
@@ -3671,9 +3842,9 @@ msgid "3"
 msgstr "3"
 
 #. module: account
-#: model:ir.actions.report.xml,name:account.account_vat_declaration
-msgid "Taxes Report"
-msgstr "Rapport de taxes"
+#: constraint:account.period:0
+msgid "Error ! The date duration of the Period(s) is invalid. "
+msgstr "Erreur ! les dates de la période ne sont pas correctes. "
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -3744,9 +3915,9 @@ msgid "# of Digits"
 msgstr "# longueur des comptes"
 
 #. module: account
-#: help:res.partner,property_payment_term:0
-msgid "This payment term will be used instead of the default one for the current partner"
-msgstr ""
+#: wizard_field:account.move.line.reconcile,addendum,period_id:0
+msgid "Write-Off Period"
+msgstr "Période d'ajustement"
 
 #. module: account
 #: wizard_field:account.invoice.pay,addendum,comment:0
@@ -3760,18 +3931,11 @@ msgid "The partner account used for this invoice."
 msgstr "Le compte partenaire utilisé pour cette facture"
 
 #. module: account
-#: help:account.tax.code,notprintable:0
-#: help:account.tax.code.template,notprintable:0
-msgid "Check this box if you don't want any VAT related to this Tax Code to appear on invoices"
-msgstr ""
-
-#. module: account
 #: field:account.account.type,sequence:0
 #: field:account.invoice.tax,sequence:0
 #: field:account.journal.column,sequence:0
 #: field:account.model.line,sequence:0
 #: field:account.payment.term.line,sequence:0
-#: field:account.sequence.fiscalyear,sequence_id:0
 #: field:account.tax,sequence:0
 #: field:account.tax.template,sequence:0
 #: field:fiscalyear.seq,sequence_id:0
@@ -3800,11 +3964,6 @@ msgid "Define Fiscal Years and Select Charts of Account"
 msgstr "Sélectionner l'exercice fiscal et le plan comptable"
 
 #. module: account
-#: wizard_field:account.move.line.reconcile,addendum,period_id:0
-msgid "Write-Off Period"
-msgstr "Période d'ajustement"
-
-#. module: account
 #: selection:account.config.wizard,period:0
 msgid "3 Months"
 msgstr "3 mois"
@@ -3816,14 +3975,12 @@ msgstr "Ecritures standards"
 
 #. module: account
 #: help:account.account,check_history:0
-msgid "Check this box if you want to print all entries when printing the General Ledger, otherwise it will only print its balance."
-msgstr "Cochez cette case si vous souhaitez imprimer toutes les écritures avec le grand livre."
-
-#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "Global taxes defined, but are not in invoice lines !"
+msgid ""
+"Check this box if you want to print all entries when printing the General "
+"Ledger, otherwise it will only print its balance."
 msgstr ""
+"Cochez cette case si vous souhaitez imprimer toutes les écritures avec le "
+"grand livre."
 
 #. module: account
 #: selection:account.config.wizard,period:0
@@ -3837,11 +3994,10 @@ msgid "Account Subscription"
 msgstr "Écritures périodiques"
 
 #. module: account
-#: field:account.model.line,date_maturity:0
-#: field:account.move.line,date_maturity:0
-#: rml:account.overdue:0
-msgid "Maturity date"
-msgstr "Echéance"
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "Cost Ledger -"
+msgstr "Journal des coûts -"
 
 #. module: account
 #: view:account.subscription:0
@@ -3859,11 +4015,9 @@ msgid "Account Configure Wizard "
 msgstr "Assistant de configuration de compte "
 
 #. module: account
-#: field:account.config.wizard,date1:0
-#: field:account.fiscalyear,date_start:0
-#: field:account.subscription,date_start:0
-msgid "Start Date"
-msgstr ""
+#: wizard_button:account.wizard_paid_open,init,yes:0
+msgid "Yes"
+msgstr "Oui"
 
 #. module: account
 #: wizard_view:account.general.ledger.report,account_selection:0
@@ -3883,11 +4037,6 @@ msgid "Draft Invoices"
 msgstr "Factures en brouillon"
 
 #. module: account
-#: model:ir.model,name:account.model_account_fiscal_position_tax_template
-msgid "Fiscal Position Template Tax Mapping"
-msgstr ""
-
-#. module: account
 #: rml:account.invoice:0
 msgid "Invoice Date"
 msgstr "Date de facture"
@@ -3899,6 +4048,16 @@ msgid "The journal must have centralised counterpart"
 msgstr "Le journal attend une contrepartie centralisée"
 
 #. module: account
+#: code:addons/account/account.py:0
+#, python-format
+msgid ""
+"You can not modify a posted entry of this journal !\n"
+"You should mark the journal to allow canceling entries."
+msgstr ""
+"Vous ne pouvez pas modifier une écriture de ce journal !\n"
+"Vous devriez indiquer que ce journal accepte les modifications."
+
+#. module: account
 #: selection:account.account.type,close_method:0
 msgid "Unreconciled"
 msgstr "Non-lettré"
@@ -3921,17 +4080,10 @@ msgid "Bad total !"
 msgstr "Mauvais montant !"
 
 #. module: account
-#: model:ir.module.module,description:account.module_meta_information
-msgid "Financial and accounting module that covers:\n"
-"    General accounting\n"
-"    Cost / Analytic accounting\n"
-"    Third party accounting\n"
-"    Taxes management\n"
-"    Budgets\n"
-"    Customer and Supplier Invoices\n"
-"    Bank statements\n"
-"    "
-msgstr ""
+#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
+#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
+msgid "New Statement"
+msgstr "Nouvelle déclaration"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -3951,8 +4103,12 @@ msgstr "Écritures de règlement"
 
 #. module: account
 #: help:account.automatic.reconcile,init,account_ids:0
-msgid "If no account is specified, the reconciliation will be made using every accounts that can be reconcilied"
-msgstr "Si le compte n'est pas spécifié, le lettrage pourrait être accepté sur n'importe quel compte"
+msgid ""
+"If no account is specified, the reconciliation will be made using every "
+"accounts that can be reconcilied"
+msgstr ""
+"Si le compte n'est pas spécifié, le lettrage pourrait être accepté sur "
+"n'importe quel compte"
 
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
@@ -3984,19 +4140,23 @@ msgid "Movement"
 msgstr "Mouvement"
 
 #. module: account
-#: help:account.period,special:0
-msgid "These periods can overlap."
-msgstr "Ces périodes ne peuvent se chevaucher."
+#: rml:account.general.journal:0
+msgid "General Journal -"
+msgstr "Journal Général -"
 
 #. module: account
-#: help:product.template,property_account_expense:0
-msgid "This account will be used instead of the default one to value outgoing stock for the current product"
+#: help:product.category,property_account_income_categ:0
+msgid ""
+"This account will be used, instead of the default one, to value incoming "
+"stock for the current product category"
 msgstr ""
+"Ce compte sera utilisé, au lieu de celui par défaut, pour valoriser le stock "
+"sortant pour la catégorie de produit courante"
 
 #. module: account
-#: model:process.node,note:account.process_node_manually0
-msgid "Encode manually the statement"
-msgstr "Encoder le relevé de compte manuellement"
+#: rml:account.overdue:0
+msgid "Balance:"
+msgstr "Balance"
 
 #. module: account
 #: rml:account.overdue:0
@@ -4028,19 +4188,20 @@ msgid "."
 msgstr ","
 
 #. module: account
-#: field:account.analytic.account,quantity_max:0
-msgid "Maximum Quantity"
-msgstr ""
-
-#. module: account
 #: field:account.period,name:0
 msgid "Period Name"
 msgstr "Période"
 
 #. module: account
 #: help:account.analytic.journal,type:0
-msgid "Gives the type of the analytic journal. When a document (eg: an invoice) needs to create analytic entries, Open ERP will look for a matching journal of the same type."
-msgstr "Indiquer le type de journal analytique. Quand un élément attend une affectation analytique, le système recherchera à l'accorder avec un journal similaire."
+msgid ""
+"Gives the type of the analytic journal. When a document (eg: an invoice) "
+"needs to create analytic entries, Open ERP will look for a matching journal "
+"of the same type."
+msgstr ""
+"Indiquer le type de journal analytique. Quand un élément attend une "
+"affectation analytique, le système recherchera à l'accorder avec un journal "
+"similaire."
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -4127,9 +4288,14 @@ msgid "Credit"
 msgstr "Crédit"
 
 #. module: account
+#: help:account.tax,child_depend:0
 #: help:account.tax.template,child_depend:0
-msgid "Indicate if the tax computation is based on the value computed for the computation of child taxes or based on the total amount."
-msgstr "Indique si le calcul de taxe est basé sur la valeur calculée pour la calculation des taxes de l'enfant ou basée sur le montatn total"
+msgid ""
+"Indicate if the tax computation is based on the value computed for the "
+"computation of child taxes or based on the total amount."
+msgstr ""
+"Indique si le calcul de taxe est basé sur la valeur calculée pour la "
+"calculation des taxes de l'enfant ou basée sur le montatn total"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
@@ -4138,10 +4304,10 @@ msgid "Refund Tax Account"
 msgstr "Compte de taxe à payer"
 
 #. module: account
-#: field:account.tax.code,child_ids:0
-#: field:account.tax.code.template,child_ids:0
-msgid "Child Codes"
-msgstr ""
+#: model:ir.actions.act_window,name:account.action_invoice_tree9
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree9
+msgid "Unpaid Supplier Invoices"
+msgstr "Factures client en attente de règlement"
 
 #. module: account
 #: field:account.invoice,move_name:0
@@ -4160,6 +4326,11 @@ msgid "Taxed Amount"
 msgstr "Montant Taxé"
 
 #. module: account
+#: field:account.subscription,date_start:0
+msgid "Starting date"
+msgstr "Début de la période"
+
+#. module: account
 #: field:account.invoice.line,price_subtotal:0
 msgid "Subtotal w/o tax"
 msgstr "Sous-total hors taxe"
@@ -4187,8 +4358,12 @@ msgstr "       Inclus les écritures lettrées"
 
 #. module: account
 #: help:account.move.line,blocked:0
-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'entrée comme un litige avec le partenaire associé"
+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'entrée comme un "
+"litige avec le partenaire associé"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -4202,6 +4377,12 @@ msgid "Payable Limit"
 msgstr "Plafond autorisé"
 
 #. module: account
+#: wizard_field:account.move.line.reconcile,init_full,writeoff:0
+#: wizard_field:account.move.line.reconcile,init_partial,writeoff:0
+msgid "Write-Off amount"
+msgstr "Montant de l'ajustement"
+
+#. module: account
 #: wizard_field:account.account.balance.report,checktype,state:0
 #: wizard_field:account.general.ledger.report,checktype,state:0
 #: wizard_field:account.partner.balance.report,init,state:0
@@ -4298,23 +4479,26 @@ msgstr "Taxes par défaut"
 
 #. module: 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 !"
-
-#. module: account
-#: help:account.account.type,sign:0
-msgid "Allows you to change the sign of the balance amount displayed in the reports, so that you can see positive figures instead of negative ones in expenses accounts."
+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
 #: help:account.config.wizard,code:0
 msgid "Name of the fiscal year as displayed in reports."
-msgstr "Nom de l'exercice fiscal tel qu'affiché dans les éditions et rapports"
+msgstr ""
+"Nom de l'exercice fiscal tel qu'affiché dans les éditions et rapports"
 
 #. module: account
 #: help:account.move.line,date_maturity:0
-msgid "This field is used for payable and receivable entries. You can put the limit 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'entrée."
+msgid ""
+"This field is used for payable and receivable entries. You can put the limit "
+"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'entrée."
 
 #. module: account
 #: rml:account.tax.code.entries:0
@@ -4337,7 +4521,7 @@ msgid "Type Controls"
 msgstr "Types de contrôle"
 
 #. module: account
-#: field:account.analytic.account,name:0
+#: field:account.analytic.account,complete_name:0
 #: rml:account.analytic.account.analytic.check:0
 #: rml:account.analytic.account.balance:0
 #: rml:account.analytic.account.inverted.balance:0
@@ -4367,10 +4551,9 @@ msgid "Unpaid Customer Invoices"
 msgstr "Factures client en attente de règlement"
 
 #. module: account
-#: model:ir.actions.act_window,name:account.action_invoice_tree2
-#: model:ir.ui.menu,name:account.menu_action_invoice_tree2
-msgid "Supplier Invoices"
-msgstr "Factures fournisseur"
+#: field:account.subscription,period_total:0
+msgid "Number of period"
+msgstr "Nombre de période"
 
 #. module: account
 #: field:account.analytic.line,product_id:0
@@ -4390,11 +4573,6 @@ msgid ")"
 msgstr ")"
 
 #. module: account
-#: field:res.partner,credit:0
-msgid "Total Receivable"
-msgstr "Total à recevoir"
-
-#. module: account
 #: model:ir.model,name:account.model_account_period
 msgid "Account period"
 msgstr "Période"
@@ -4410,9 +4588,11 @@ msgid "Canceled Invoice"
 msgstr "Facture annulée"
 
 #. module: account
-#: view:account.subscription:0
-msgid "Remove Lines"
-msgstr "Supprimer lignes"
+#: field:account.model.line,date_maturity:0
+#: field:account.move.line,date_maturity:0
+#: rml:account.overdue:0
+msgid "Maturity date"
+msgstr "Echéance"
 
 #. module: account
 #: wizard_field:account.general.ledger.report,checktype,soldeinit:0
@@ -4448,6 +4628,11 @@ msgid "Closing Balance"
 msgstr ""
 
 #. module: account
+#: rml:account.central.journal:0
+msgid "Central Journal-"
+msgstr ""
+
+#. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "9"
 msgstr "9"
@@ -4459,6 +4644,15 @@ msgid "Running Subscriptions"
 msgstr "Abonnements en cours"
 
 #. module: account
+#: help:res.partner,property_account_receivable:0
+msgid ""
+"This account will be used, instead of the default one, as the receivable "
+"account for the current partner"
+msgstr ""
+"Ce compte sera utilisé, au lieu de celui par defaut, en tant que compte de "
+"créance pour le partenaire courant"
+
+#. module: account
 #: selection:account.move,type:0
 msgid "Bank Payment"
 msgstr "Paiement bancaire"
@@ -4475,10 +4669,9 @@ msgid "Credit Notes"
 msgstr "Avoirs"
 
 #. module: account
-#: field:account.config.wizard,date2:0
-#: field:account.fiscalyear,date_stop:0
-msgid "End Date"
-msgstr ""
+#: wizard_field:account.aged.trial.balance,init,period_length:0
+msgid "Period length (days)"
+msgstr "Durée d'une période (jours)"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_open_closed_fiscalyear
@@ -4508,25 +4701,28 @@ msgid "End of Year Treatments"
 msgstr "Traitements de fin d'année"
 
 #. module: account
-#: help:account.tax,sequence:0
-msgid "The sequence field is used to order the tax lines from the lowest sequences to the higher ones. The order is important if you have a tax with several tax children. In this case, the evaluation order is important."
-msgstr ""
-
-#. module: account
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Declaration"
 msgstr "Déclaration fiscale"
 
 #. module: account
+#: wizard_view:account.chart,init:0
+msgid "(If you do not select Fiscal year it will take all open fiscal year)"
+msgstr ""
+"(si vous ne sélectionnez d'année fiscale, toutes les années fiscales "
+"ouvertes seront prises)"
+
+#. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "File statement"
 msgstr "Fichier de relevé"
 
 #. module: account
-#: view:ir.sequence:0
-msgid "Fiscal Year Sequences"
-msgstr ""
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Free Reference"
+msgstr "Référence libre"
 
 #. module: account
 #: view:account.model.line:0
@@ -4559,16 +4755,20 @@ msgid "Are you sure you want to open this invoice ?"
 msgstr "Confirmez-vous l'ouverture de cette facture ?"
 
 #. module: account
+#: help:account.tax,price_include:0
+msgid ""
+"Check this is the price you use on the product and invoices is including "
+"this tax."
+msgstr ""
+"Vérifiez que ce prix que vous utilisez sur le produit et factures inclus "
+"cette taxe."
+
+#. module: account
 #: view:res.partner:0
 msgid "Supplier Debit"
 msgstr "Débit fournisseur"
 
 #. module: account
-#: help:account.model.line,quantity:0
-msgid "The optional quantity on entries"
-msgstr ""
-
-#. module: account
 #: rml:account.third_party_ledger:0
 msgid "JNRL"
 msgstr "JNRL"
@@ -4597,24 +4797,15 @@ msgid "General Ledger -"
 msgstr "Grand livre -"
 
 #. module: account
-#: field:report.hr.timesheet.invoice.journal,quantity:0
-msgid "Quantities"
-msgstr "Quantités"
-
-#. module: account
 #: field:account.analytic.account,date_start:0
 msgid "Date Start"
 msgstr "Date de départ"
 
 #. module: account
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.quantity_cost_ledger:0
-#: field:account.invoice,amount_total:0
-#: field:account.invoice,check_total:0
-msgid "Total"
-msgstr "Total"
+#: code:addons/account/invoice.py:0
+#, python-format
+msgid "Can not create invoice move on centralised journal"
+msgstr ""
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -4641,12 +4832,9 @@ msgid "Allow Reconciliation"
 msgstr "Autoriser le lettrage"
 
 #. module: account
-#: selection:account.account.balance.report,checktype,state:0
-#: selection:account.general.ledger.report,checktype,state:0
-#: selection:account.partner.balance.report,init,state:0
-#: selection:account.third_party_ledger.report,init,state:0
-msgid "By Date"
-msgstr "Par date"
+#: rml:account.analytic.account.journal:0
+msgid "Move name"
+msgstr "Nom du mouvement"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -4676,8 +4864,12 @@ msgstr "Statistiques des comptes analytiques"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
-msgid "This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template"
-msgstr "L'opération suivante va créer automatiquement le plan comptable, la banque, les taxes et journaux d'après le modèle choisi."
+msgid ""
+"This will automatically configure your chart of accounts, bank accounts, "
+"taxes and journals according to the selected template"
+msgstr ""
+"L'opération suivante va créer automatiquement le plan comptable, la banque, "
+"les taxes et journaux d'après le modèle choisi."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4715,12 +4907,6 @@ msgid "Analytic Entries by 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 ""
-
-#. module: account
 #: field:account.account,company_id:0
 #: wizard_field:account.account.balance.report,checktype,company_id:0
 #: wizard_field:account.aged.trial.balance,init,company_id:0
@@ -4750,15 +4936,13 @@ msgid "Running"
 msgstr "En cours"
 
 #. module: account
-#: code:addons/account/account.py:0
-#, python-format
-msgid "You can not delete posted movement: \"%s\"!"
-msgstr "Vous ne pouvez pas effacer de mouvement posté: \"%s\" !"
-
-#. module: account
 #: help:account.tax,include_base_amount:0
-msgid "Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"
-msgstr "Indique si le montant de la taxe doit être compris dans le montant de base pour le calcul des taxes suivantes"
+msgid ""
+"Indicate if the amount of tax must be included in the base amount for the "
+"computation of the next taxes"
+msgstr ""
+"Indique si le montant de la taxe doit être compris dans le montant de base "
+"pour le calcul des taxes suivantes"
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
@@ -4781,13 +4965,7 @@ msgid "4"
 msgstr "4"
 
 #. module: account
-#: help:res.partner,credit:0
-msgid "Total amount this customer owes you."
-msgstr ""
-
-#. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_form
-#: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear_form
 msgid "Fiscal Years"
 msgstr "Exercice fiscal"
@@ -4814,18 +4992,6 @@ msgid "Icon"
 msgstr "Icône"
 
 #. module: account
-#: code:addons/account/account.py:0
-#: code:addons/account/account_move_line.py:0
-#: code:addons/account/invoice.py:0
-#: code:addons/account/wizard/wizard_automatic_reconcile.py:0
-#: code:addons/account/wizard/wizard_fiscalyear_close.py:0
-#: code:addons/account/wizard/wizard_fiscalyear_close_state.py:0
-#: code:addons/account/wizard/wizard_journal.py:0
-#, python-format
-msgid "UserError"
-msgstr "ErreurUtilisateur"
-
-#. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal - Period"
 msgstr "Journal - Période"
@@ -4849,14 +5015,29 @@ msgstr "Imprimer la balance agée"
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
-msgid "You can specify year, month and date in the name of the model using the following labels:\n\n%(year)s : To Specify Year \n%(month)s : To Specify Month \n%(date)s : Current Date\n\ne.g. My model on %(date)s"
-msgstr ""
+msgid ""
+"You can specify year, month and date in the name of the model using the "
+"following labels:\n"
+"\n"
+"%(year)s : To Specify Year \n"
+"%(month)s : To Specify Month \n"
+"%(date)s : Current Date\n"
+"\n"
+"e.g. My model on %(date)s"
+msgstr ""
+"Vous pouvez préciser l'année, le mois, la date dans le modèle en utilisant "
+"les procédés suivants :\n"
+"\n"
+"%(year)s : pour indiquer l'année \n"
+"%(month)s : pour indiquer le mois \n"
+"%(date)s : Date courante"
 
 #. module: account
 #: field:account.analytic.line,ref:0
 #: field:account.bank.statement.line,ref:0
 #: field:account.model.line,ref:0
 #: field:account.move.line,ref:0
+#: field:account.subscription,ref:0
 #: rml:account.third_party_ledger:0
 msgid "Ref."
 msgstr "Référence"
@@ -4874,18 +5055,25 @@ msgstr ""
 #. module: account
 #: code:addons/account/invoice.py:0
 #, python-format
-msgid "Tax base different !\nClick on compute to update tax base"
+msgid ""
+"Tax base different !\n"
+"Click on compute to update tax base"
 msgstr ""
+"La base de taxes est différente !\n"
+"Cliquer sur le bouton caculer pour mettre à jour la taxe"
 
 #. module: account
-#: help:account.journal,centralisation:0
-msgid "Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."
-msgstr ""
+#: selection:account.account.balance.report,checktype,state:0
+#: selection:account.general.ledger.report,checktype,state:0
+#: selection:account.partner.balance.report,init,state:0
+#: selection:account.third_party_ledger.report,init,state:0
+msgid "By Date"
+msgstr "Par date"
 
 #. module: account
 #: selection:account.invoice,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulée"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -4927,9 +5115,9 @@ msgid "Bank Statement Line"
 msgstr "Détail du relevé bancaire"
 
 #. module: account
-#: wizard_button:account.automatic.reconcile,reconcile,end:0
-msgid "OK"
-msgstr "OK"
+#: field:account.config.wizard,date2:0
+msgid "Ending Date"
+msgstr "Date de clôture"
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
@@ -4944,6 +5132,12 @@ msgid "Receivable"
 msgstr "Créditeurs"
 
 #. module: account
+#: help:account.invoice.tax,base_code_id:0
+#: help:account.invoice.tax,tax_code_id:0
+msgid "The case of the tax declaration."
+msgstr "Case du formulaire de déclaration de taxes"
+
+#. module: account
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.actions.wizard,name:account.wizard_account_balance_report
 #: model:ir.actions.wizard,name:account.wizard_balance_report
@@ -4975,7 +5169,6 @@ msgid "VAT:"
 msgstr "TVA :"
 
 #. module: account
-#: rml:account.analytic.account.cost_ledger:0
 #: rml:account.analytic.account.quantity_cost_ledger:0
 #: rml:account.central.journal:0
 #: rml:account.general.journal:0
@@ -4984,23 +5177,31 @@ msgid "Total:"
 msgstr "Total :"
 
 #. module: account
+#: code:addons/account/wizard/wizard_open_closed_fiscalyear.py:0
+#, python-format
+msgid "No journal for ending writings have been defined for the fiscal year"
+msgstr ""
+"Aucun journal n'a été défini pour les écritures de clôture d'exercice"
+
+#. module: account
 #: model:ir.model,name:account.model_account_analytic_journal
 msgid "account.analytic.journal"
 msgstr "Journal analytique"
 
 #. module: account
-#: view:account.fiscal.position:0
-#: field:account.fiscal.position,account_ids:0
-#: field:account.fiscal.position.template,account_ids:0
-msgid "Account Mapping"
-msgstr ""
-
-#. module: account
 #: view:product.product:0
 msgid "Sale Taxes"
 msgstr "Taxes à la vente"
 
 #. module: account
+#: help:account.tax.template,include_base_amount:0
+msgid ""
+"Indicate if the amount of tax must be included in the base amount for the "
+"computation of the next taxes."
+msgstr ""
+"Indiquer si le montant de la taxe doit être inclus dans la base de calcul"
+
+#. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
 msgstr "Lettrage de compte"
@@ -5022,10 +5223,14 @@ msgid "Parent Account Template"
 msgstr "Modèle de compte parent"
 
 #. module: account
-#: help:account.tax,domain:0
 #: help:account.tax.template,domain:0
-msgid "This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."
-msgstr "Ce champ est uniquement utilisé si vous développez votre propre module, permettant ainsi aux développeurs de créer des taxes spécifiques dans un domaine spécifique."
+msgid ""
+"This field is only used if you develop your own module allowing developers "
+"to create specific taxes in a custom domain."
+msgstr ""
+"Ce champ est uniquement utilisé si vous développez votre propre module, "
+"permettant ainsi aux développeurs de créer des taxes spécifiques dans un "
+"domaine spécifique."
 
 #. module: account
 #: field:account.bank.statement.reconcile,total_amount:0
@@ -5034,6 +5239,11 @@ msgid "Payment amount"
 msgstr "Montant payé"
 
 #. module: account
+#: help:account.model.line,quantity:0
+msgid "The optionnal quantity on entries"
+msgstr "La quantité optionelle des entrées"
+
+#. module: account
 #: view:account.analytic.account:0
 msgid "Analytic account"
 msgstr "Compte analytique"
@@ -5094,9 +5304,10 @@ msgid "Invoice Lines"
 msgstr "Lignes de facture"
 
 #. module: account
-#: field:account.period,date_start:0
-msgid "Start of Period"
-msgstr ""
+#: model:ir.actions.act_window,name:account.action_invoice_tree13
+#: model:ir.ui.menu,name:account.menu_action_invoice_tree13
+msgid "Unpaid Supplier Refunds"
+msgstr "Avoirs fournisseurs en attente de déduction"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,report_name:0
@@ -5120,15 +5331,9 @@ msgid "Tax Description"
 msgstr "Nom de la taxe"
 
 #. module: account
-#: help:account.invoice,move_id:0
-msgid "Link to the automatically generated account moves."
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_move_line.py:0
-#, python-format
-msgid "You can not use an inactive account!"
-msgstr "Vous ne pouvez pas utiliser un compte inactif!"
+#: rml:account.analytic.account.cost_ledger:0
+msgid "Code / Date"
+msgstr "Code / Date"
 
 #. module: account
 #: wizard_field:account.automatic.reconcile,reconcile,reconciled:0
@@ -5141,6 +5346,8 @@ msgid "Reporting"
 msgstr "Reporting"
 
 #. module: account
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
 #: rml:account.third_party_ledger:0
 msgid "/"
 msgstr "/"
@@ -5172,10 +5379,9 @@ msgid "Configuration"
 msgstr "Configuration"
 
 #. module: account
-#: view:account.analytic.line:0
-#: view:account.invoice:0
-msgid "Total amount"
-msgstr "Montant total"
+#: field:account.config.wizard,date1:0
+msgid "Starting Date"
+msgstr "Date de début"
 
 #. module: account
 #: view:account.journal:0
@@ -5242,8 +5448,12 @@ msgstr "Nouvel avoir client"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,seq_journal:0
-msgid "Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."
+msgid ""
+"Check this box if you want to use a different sequence for each created "
+"journal. Otherwise, all will use the same sequence."
 msgstr ""
+"Cocher cette case si vous voulez utiliser des numérotations différentes pour "
+"chaque journal créé. Sans cela, ils utiliseront tous la même numérotation."
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_populate_statement_from_inv
@@ -5260,7 +5470,7 @@ msgstr "Délettrage"
 #. module: account
 #: model:ir.model,name:account.model_fiscalyear_seq
 msgid "Maintains Invoice sequences with Fiscal Year"
-msgstr ""
+msgstr "Maintient la numérotation des factures avec l'Année Fiscale"
 
 #. module: account
 #: selection:account.account.balance.report,checktype,display_account:0
@@ -5285,9 +5495,9 @@ msgid "Account Tax Code Template"
 msgstr ""
 
 #. module: account
-#: rml:account.overdue:0
-msgid "Balance:"
-msgstr "Balance"
+#: model:process.node,note:account.process_node_manually0
+msgid "Encode manually the statement"
+msgstr "Encoder le relevé de compte manuellement"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -5325,6 +5535,15 @@ msgid "Write-Off journal"
 msgstr "Journal des ajustements"
 
 #. module: account
+#: help:account.account,reconcile:0
+msgid ""
+"Check this account if the user can make a reconciliation of the entries in "
+"this account."
+msgstr ""
+"Cochez ce compte si l'utilisateur peut faire une réconciliation des entrées "
+"dans ce compte."
+
+#. module: account
 #: wizard_button:account.invoice.pay,init,writeoff_check:0
 msgid "Full Payment"
 msgstr "Paiement total"
@@ -5337,7 +5556,7 @@ msgstr ""
 #. module: account
 #: selection:account.move,type:0
 msgid "Cash Receipt"
-msgstr ""
+msgstr "Reçu de caisse"
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -5364,14 +5583,14 @@ msgstr ""
 #: code:addons/account/wizard/wizard_journal.py:0
 #, python-format
 msgid "This period is already closed !"
-msgstr ""
+msgstr "Cette période est déjà cloturée !"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,init,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Paiements"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -5381,14 +5600,17 @@ msgstr ""
 #. module: account
 #: code:addons/account/account.py:0
 #, python-format
-msgid "No fiscal year defined for this date !\nPlease create one."
+msgid ""
+"No fiscal year defined for this date !\n"
+"Please create one."
 msgstr ""
+"Pas d'exercice définit pour cette date !\n"
+"Veuillez en créer un."
 
 #. module: account
-#: code:addons/account/wizard/wizard_validate_account_move.py:0
-#, python-format
-msgid "Selected Move lines does not have any account move enties in draft state"
-msgstr "Sélectionner les lignes de mouvements qui ne peuvent être à l'état brouillon"
+#: model:ir.model,name:account.model_account_fiscal_position_account_template
+msgid "Fiscal Position Template Accounts Mapping"
+msgstr ""
 
 #. module: account
 #: wizard_button:account.wizard_paid_open,init,end:0
@@ -5401,9 +5623,9 @@ msgid "All account entries"
 msgstr "Toutes les entrées de compte"
 
 #. module: account
-#: help:account.invoice.tax,tax_code_id:0
-msgid "The tax basis of the tax declaration."
-msgstr ""
+#: selection:account.subscription,period_type:0
+msgid "year"
+msgstr "Année"
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -5416,13 +5638,7 @@ msgstr ""
 #. module: account
 #: wizard_view:populate_statement_from_inv,init:0
 msgid "Choose Journal and Payment Date"
-msgstr ""
-
-#. module: account
-#: code:addons/account/invoice.py:0
-#, python-format
-msgid "You must define an analytic journal of type '%s' !"
-msgstr ""
+msgstr "Choisissez un Journal et une Date de Paiement"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5444,9 +5660,9 @@ msgid "Unpaid Customer Refunds"
 msgstr "Notes de Crédit Client Non Payées"
 
 #. module: account
-#: help:account.invoice,residual:0
-msgid "Remaining amount due."
-msgstr ""
+#: wizard_field:account.analytic.line,init,from_date:0
+msgid "From"
+msgstr "Période du"
 
 #. module: account
 #: wizard_view:account.period.close,init:0
@@ -5489,7 +5705,7 @@ msgstr ""
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Bad account!"
-msgstr ""
+msgstr "Compte Incorrect !"
 
 #. module: account
 #: selection:account.analytic.account,type:0
@@ -5503,21 +5719,6 @@ msgid "Supplier Invoice Process"
 msgstr ""
 
 #. module: account
-#: rml:account.account.balance:0
-#: rml:account.analytic.account.analytic.check:0
-#: rml:account.analytic.account.balance:0
-#: rml:account.analytic.account.inverted.balance:0
-#: rml:account.analytic.account.journal:0
-#: rml:account.general.ledger:0
-#: rml:account.journal.period.print:0
-#: rml:account.partner.balance:0
-#: rml:account.tax.code.entries:0
-#: rml:account.third_party_ledger:0
-#: rml:account.vat.declaration:0
-msgid "Page"
-msgstr ""
-
-#. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Optional Information"
@@ -5557,9 +5758,13 @@ msgid "and Journals"
 msgstr "et journaux"
 
 #. module: account
-#: model:account.journal,name:account.expenses_journal
-msgid "x Expenses Journal"
-msgstr "x Journal des dépenses"
+#: help:account.account.template,reconcile:0
+msgid ""
+"Check this option if the user can make a reconciliation of the entries in "
+"this account."
+msgstr ""
+"Cochez cette option si l'utilisateur a le droit de réconcilier les entrées "
+"de ce compte."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5571,12 +5776,7 @@ msgstr "Calculer"
 #. module: account
 #: help:account.invoice.line,account_id:0
 msgid "The income or expense account related to the selected product."
-msgstr ""
-
-#. module: account
-#: field:account.tax,type_tax_use:0
-msgid "Tax Application"
-msgstr ""
+msgstr "Le compte de revenu ou de dépense associé au produit sélectionné."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
@@ -5591,21 +5791,32 @@ msgid "Closing of fiscal year cancelled, please check the box !"
 msgstr ""
 
 #. module: account
+#: view:account.analytic.line:0
+#: view:account.invoice:0
+msgid "Total amount"
+msgstr "Montant total"
+
+#. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree6
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree6
 msgid "PRO-FORMA Customer Invoices"
 msgstr "Facture client Pro-Forma"
 
 #. module: account
-#: field:account.subscription,period_total:0
-msgid "Number of Periods"
-msgstr ""
+#: field:account.invoice,amount_untaxed:0
+msgid "Untaxed"
+msgstr "Non taxé"
 
 #. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "Bad account !"
-msgstr ""
+msgstr "Compte incorrect !"
+
+#. module: account
+#: rml:account.analytic.account.cost_ledger:0
+msgid "Total :"
+msgstr "Total :"
 
 #. module: account
 #: code:addons/account/account.py:0
@@ -5614,7 +5825,7 @@ msgstr ""
 #: code:addons/account/wizard/wizard_open_closed_fiscalyear.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Erreur"
 
 #. module: account
 #: wizard_field:account.analytic.account.analytic.check.report,init,date2:0
@@ -5624,6 +5835,7 @@ msgstr ""
 #: wizard_field:account.analytic.account.journal.report,init,date2:0
 #: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date2:0
 #: wizard_field:account.automatic.reconcile,init,date2:0
+#: field:account.period,date_stop:0
 msgid "End of period"
 msgstr "Fin de la période"
 
@@ -5634,7 +5846,6 @@ msgid "Account Entry"
 msgstr "Écriture comptable"
 
 #. module: account
-#: rml:account.general.journal:0
 #: model:ir.actions.report.xml,name:account.account_general_journal
 msgid "General Journal"
 msgstr "Journal Général"
@@ -5661,7 +5872,7 @@ msgstr "Solde de la balance"
 #: code:addons/account/invoice.py:0
 #, python-format
 msgid "Taxes missing !"
-msgstr ""
+msgstr "Taxes manquantes"
 
 #. module: account
 #: help:account.invoice,partner_bank:0
@@ -5691,6 +5902,11 @@ msgid "Analytic Journal Definition"
 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 Entrées Créées"
+
+#. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
 msgstr "account.tax.template"
@@ -5701,14 +5917,9 @@ msgid "Bank Accounts"
 msgstr "Comptes bancaire"
 
 #. module: account
-#: constraint:account.period:0
-msgid "Invalid period ! Some periods overlap or the date period is not in the scope of the fiscal year. "
-msgstr ""
-
-#. module: account
-#: help:account.journal,invoice_sequence_id:0
-msgid "The sequence used for invoice numbers in this journal."
-msgstr ""
+#: field:res.partner,credit:0
+msgid "Total Receivable"
+msgstr "Total à recevoir"
 
 #. module: account
 #: view:account.account:0
@@ -5721,13 +5932,19 @@ msgstr "Informations générales"
 
 #. module: account
 #: help:populate_statement_from_inv,init,journal_id:0
-msgid "This field allow you to choose the accounting journals you want for filtering the invoices. If you left this field empty, it will search on all sale, purchase and cash journals."
+msgid ""
+"This field allow you to choose the accounting journals you want for "
+"filtering the invoices. If you left this field empty, it will search on all "
+"sale, purchase and cash journals."
 msgstr ""
+"Ce champ permet de choisir les journaux de compte que vous désirez pour "
+"filtrer les factures. Si vous laissez ce champ vide, la recherche se fera "
+"sur tous les journaux de vente, d'achat et de caisse."
 
 #. module: account
-#: constraint:account.fiscalyear:0
-msgid "Error ! The duration of the Fiscal Year is invalid. "
-msgstr ""
+#: model:ir.actions.report.xml,name:account.account_vat_declaration
+msgid "Taxes Report"
+msgstr "Rapport de taxes"
 
 #. module: account
 #: selection:account.analytic.account,state:0
@@ -5754,7 +5971,7 @@ msgstr "Liste des Comptes"
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Propriétés des Ventes"
 
 #. module: account
 #: code:addons/account/wizard/wizard_fiscalyear_close_state.py:0
@@ -5763,6 +5980,11 @@ msgid "Closing of states cancelled, please check the box !"
 msgstr ""
 
 #. module: account
+#: help:account.config.wizard,name:0
+msgid "Name of the fiscal year as displayed on screens."
+msgstr "Nom de l'exercice tel qu'affiché à l'écran."
+
+#. module: account
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 #: model:ir.actions.wizard,name:account.account_analytic_account_quantity_cost_ledger_report
 msgid "Cost Ledger (Only quantities)"
@@ -5772,7 +5994,7 @@ msgstr "Grand Livre (quantités uniquement)"
 #: code:addons/account/account_move_line.py:0
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Vous devez définir un journal analytique sur le journal '%s' !"
 
 #. module: account
 #: wizard_view:account.move.validate,init:0
@@ -5782,7 +6004,7 @@ msgstr "Valider les Entrées du Compte"
 #. module: account
 #: selection:account.print.journal.report,init,sort_selection:0
 msgid "Reference Number"
-msgstr ""
+msgstr "Numéro de référence"
 
 #. module: account
 #: rml:account.overdue:0
@@ -5792,7 +6014,7 @@ msgstr "Montant total dû :"
 #. module: account
 #: wizard_field:account.analytic.line,init,to_date:0
 msgid "To"
-msgstr ""
+msgstr "au"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
@@ -5821,16 +6043,26 @@ msgid "Fiscal Year to close"
 msgstr "Année fiscale à clôturer"
 
 #. module: account
-#: wizard_field:account.aged.trial.balance,init,date1:0
-#: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
-#: wizard_field:account.analytic.account.balance.report,init,date1:0
-#: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
-#: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
-#: wizard_field:account.analytic.account.journal.report,init,date1:0
-#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
-#: wizard_field:account.automatic.reconcile,init,date1:0
-msgid "Start of period"
-msgstr "Début de la période"
+#: help:product.template,property_account_expense:0
+msgid ""
+"This account will be used, instead of the default one, to value outgoing "
+"stock for the current product"
+msgstr ""
+"Ce compte sera utilisé, au lieu de celui par defaut, pour valoriser le stock "
+"sortant pour le produit courant"
+
+#. module: account
+#: wizard_field:account.account.balance.report,checktype,date_from:0
+#: field:account.fiscalyear,date_start:0
+msgid "Start date"
+msgstr "Date de début"
+
+#. module: account
+#: wizard_view:account.print.journal.report,init:0
+#: model:ir.actions.wizard,name:account.wizard_print_journal
+#: model:ir.ui.menu,name:account.menu_print_journal
+msgid "Print Journal"
+msgstr "Journal détaillé par écriture"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5864,14 +6096,9 @@ msgid "Description"
 msgstr "Description"
 
 #. module: account
-#: help:product.template,property_account_income:0
-msgid "This account will be used instead of the default one to value incoming stock for the current product"
-msgstr ""
-
-#. module: account
-#: field:account.tax,child_ids:0
-msgid "Child Tax Accounts"
-msgstr ""
+#: field:report.hr.timesheet.invoice.journal,quantity:0
+msgid "Quantities"
+msgstr "Quantités"
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -5879,6 +6106,19 @@ msgid "Parent Right"
 msgstr "Parent Droit"
 
 #. module: account
+#: wizard_field:account.aged.trial.balance,init,date1:0
+#: wizard_field:account.analytic.account.analytic.check.report,init,date1:0
+#: wizard_field:account.analytic.account.balance.report,init,date1:0
+#: wizard_field:account.analytic.account.cost_ledger.report,init,date1:0
+#: wizard_field:account.analytic.account.inverted.balance.report,init,date1:0
+#: wizard_field:account.analytic.account.journal.report,init,date1:0
+#: wizard_field:account.analytic.account.quantity_cost_ledger.report,init,date1:0
+#: wizard_field:account.automatic.reconcile,init,date1:0
+#: field:account.period,date_start:0
+msgid "Start of period"
+msgstr "Début de la période"
+
+#. module: account
 #: model:ir.ui.menu,name:account.account_account_menu
 msgid "Financial Accounts"
 msgstr "Comptes Financiers"
@@ -5894,8 +6134,9 @@ msgid "Account Configure"
 msgstr "Configurer le compte"
 
 #. module: account
-#: help:res.partner,property_account_payable:0
-msgid "This account will be used instead of the default one as the payable account for the current partner"
+#: model:process.transition,note:account.process_transition_suppliervalidentries0
+#: model:process.transition,note:account.process_transition_validentries0
+msgid "Valid entries from invoice"
 msgstr ""
 
 #. module: account
@@ -5905,9 +6146,15 @@ msgid "Case Code"
 msgstr "Case de la déclaration fiscale"
 
 #. module: account
+#: field:account.tax.code,child_ids:0
+#: field:account.tax.code.template,child_ids:0
+msgid "Childs Codes"
+msgstr "Codes fils"
+
+#. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #. module: account
 #: field:product.category,property_account_income_categ:0
@@ -5923,13 +6170,21 @@ msgstr "Ouverture/clôture d'exercice"
 #. module: account
 #: code:addons/account/account_move_line.py:0
 #, python-format
-msgid "Can not create an automatic sequence for this piece !\n\nPut a sequence in the journal definition for automatic numbering or create a sequence manually for this piece."
+msgid ""
+"Can not create an automatic sequence for this piece !\n"
+"\n"
+"Put a sequence in the journal definition for automatic numbering or create a "
+"sequence manually for this piece."
 msgstr ""
+"Impossible de créer une séquence automatique pour cette pièce !\n"
+"\n"
+"Ajoutez une séquence dans la définition du journal pour créer une "
+"numérotation automatique ou encodez un numéro manuellement pour cette pièce."
 
 #. module: account
 #: rml:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Balance Analytique -"
 
 #. module: account
 #: wizard_field:account_use_models,init_form,model:0
@@ -5952,7 +6207,7 @@ msgstr "Client"
 #: code:addons/account/wizard/wizard_pay_invoice.py:0
 #, python-format
 msgid "Can not pay draft invoice."
-msgstr ""
+msgstr "Impossible de payer une facture brouillon."
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5965,19 +6220,19 @@ msgid "Accounting Properties"
 msgstr "Propriétés des comptes"
 
 #. module: account
-#: model:ir.model,name:account.model_account_sequence_fiscalyear
-msgid "account.sequence.fiscalyear"
-msgstr ""
-
-#. module: account
 #: wizard_field:account.print.journal.report,init,sort_selection:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Entrées triées par"
+
+#. module: account
+#: help:account.tax,name:0
+msgid "This name will be used to be displayed on reports"
+msgstr "Ce nom sera utilisé pour être affiché sur les rapports"
 
 #. module: account
 #: rml:account.journal.period.print:0
 msgid "Print Journal -"
-msgstr ""
+msgstr "Journal d'Impression -"
 
 #. module: account
 #: field:account.bank.accounts.wizard,bank_account_id:0
@@ -6003,7 +6258,7 @@ msgstr "Liquidités"
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr ""
+msgstr "Compte de destination"
 
 #. module: account
 #: rml:account.overdue:0
@@ -6013,7 +6268,6 @@ msgstr "Échu"
 #. module: account
 #: field:account.fiscalyear,name:0
 #: field:account.period,fiscalyear_id:0
-#: field:account.sequence.fiscalyear,fiscalyear_id:0
 #: field:fiscalyear.seq,fiscalyear_id:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
@@ -6022,7 +6276,7 @@ msgstr "Exercice comptable"
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "Future"
 
 #. module: account
 #: help:account.account.balance.report,checktype,fiscalyear:0
@@ -6065,21 +6319,31 @@ msgid "Python Code (reverse)"
 msgstr "Code Python (TVA Incl)"
 
 #. module: account
-#: model:ir.module.module,shortdesc:account.module_meta_information
-msgid "Accounting and financial management"
-msgstr ""
+#: rml:account.account.balance:0
+#: rml:account.analytic.account.analytic.check:0
+#: rml:account.analytic.account.balance:0
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.inverted.balance:0
+#: rml:account.analytic.account.journal:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+#: rml:account.general.ledger:0
+#: rml:account.journal.period.print:0
+#: rml:account.partner.balance:0
+#: rml:account.tax.code.entries:0
+#: rml:account.third_party_ledger:0
+#: rml:account.vat.declaration:0
+msgid "Page"
+msgstr "Page"
 
 #. module: account
+#: view:account.fiscal.position:0
+#: field:account.fiscal.position,account_ids:0
 #: view:account.fiscal.position.template:0
+#: field:account.fiscal.position.template,account_ids:0
 msgid "Accounts Mapping"
 msgstr "Correspondance de comptes"
 
 #. module: account
-#: help:product.category,property_account_expense_categ:0
-msgid "This account will be used to value outgoing stock for the current product category"
-msgstr ""
-
-#. module: account
 #: help:account.tax,base_sign:0
 #: help:account.tax,ref_base_sign:0
 #: help:account.tax,ref_tax_sign:0
@@ -6089,12 +6353,19 @@ msgstr ""
 #: help:account.tax.template,ref_tax_sign:0
 #: help:account.tax.template,tax_sign:0
 msgid "Usually 1 or -1."
-msgstr ""
+msgstr "Couramment 1 ou -1."
 
 #. module: account
 #: help:account.invoice,date_due:0
-msgid "If you use payment terms, the due date will be computed automatically at the generation of accounting entries. If you keep the payment term and the due date empty, it means direct payment."
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. If you keep the payment term and the due "
+"date empty, it means direct payment."
 msgstr ""
+"Si vous utilisez les termes de paiement, la date de livraison sera calculée "
+"automatiquement lors de la génération des entrées comptables. Si vous "
+"laissez les termes de paiement et la date de livraison vides, cela indique "
+"un paiement direct."
 
 #. module: account
 #: view:res.partner:0
@@ -6112,14 +6383,9 @@ msgid "General Debit"
 msgstr ""
 
 #. module: account
-#: field:account.analytic.account,code:0
-msgid "Account Code"
-msgstr ""
-
-#. module: account
-#: help:account.config.wizard,name:0
-msgid "Name of the fiscal year as displayed on screens."
-msgstr ""
+#: help:account.invoice,move_id:0
+msgid "Link to the automatically generated account moves."
+msgstr "Lien vers les mouvements de comptes générés automatiquement."
 
 #. module: account
 #: field:account.invoice,payment_term:0
@@ -6139,11 +6405,6 @@ msgid "Fiscal Positions"
 msgstr "Positions fiscales"
 
 #. module: account
-#: model:process.process,name:account.process_process_statementprocess0
-msgid "Statement Process"
-msgstr ""
-
-#. module: account
 #: model:ir.model,name:account.model_account_bank_statement_reconcile
 msgid "Statement reconcile"
 msgstr "Réconciliation d'extraits"
@@ -6156,19 +6417,19 @@ msgid "Check this box"
 msgstr "Cocher cette case"
 
 #. module: account
-#: help:account.tax,price_include:0
-msgid "Check this if the price you use on the product and invoices includes this tax."
-msgstr ""
-
-#. module: account
 #: field:account.journal.column,name:0
 msgid "Column Name"
 msgstr "Nom de colonne"
 
 #. module: account
 #: help:account.move.line,quantity:0
-msgid "The optional quantity expressed by this line, eg: number of product sold. The quantity is not a legal requirement but is very usefull for some reports."
+msgid ""
+"The optional quantity expressed by this line, eg: number of product sold. "
+"The quantity is not a legal requirement but is very usefull for some reports."
 msgstr ""
+"Les quantités optionelles exprimées par cette ligne; Par exemple, le nombre "
+"de produits vendus. La quantité n'est pas une obligation légale mais est "
+"très utile pour certains rapports."
 
 #. module: account
 #: wizard_view:account.account.balance.report,checktype:0
@@ -6176,20 +6437,27 @@ msgstr ""
 #: wizard_view:account.partner.balance.report,init:0
 #: wizard_view:account.third_party_ledger.report,init:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtres"
 
 #. module: account
-#: wizard_button:account.wizard_paid_open,init,yes:0
-msgid "Yes"
-msgstr "Oui"
+#: rml:account.analytic.account.cost_ledger:0
+#: rml:account.analytic.account.quantity_cost_ledger:0
+msgid "at"
+msgstr "à"
 
 #. module: account
-#: help:account.account,reconcile:0
-msgid "Check this if the user is allowed to reconcile entries in this account."
+#: help:account.tax,applicable_type:0
+msgid ""
+"If not applicable (computed through a Python code), the tax do not appears "
+"on the invoice."
+msgstr ""
+
+#. module: account
+#: model:process.process,name:account.process_process_statementprocess0
+msgid "Statement Process"
 msgstr ""
 
 #. module: account
 #: wizard_button:account.subscription.generate,init,generate:0
 msgid "Compute Entry Dates"
 msgstr "Calculer les dates d'entrée"
-
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index edb44b623e8..d64ba93c089 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -178,6 +178,7 @@ class account_invoice(osv.osv):
                 move[line.move_id.id] = True
             for line in r.line_id:
                 move[line.move_id.id] = True
+        
         invoice_ids = []
         if move:
             invoice_ids = self.pool.get('account.invoice').search(cr, uid, [('move_id','in',move.keys())], context=context)
@@ -289,15 +290,30 @@ class account_invoice(osv.osv):
     }
 
     def unlink(self, cr, uid, ids, context=None):
-        invoices = self.read(cr, uid, ids, ['state'])
-        unlink_ids = []
-        for t in invoices:
-            if t['state'] in ('draft', 'cancel'):
-                unlink_ids.append(t['id'])
-            else:
-                raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened or paid !'))
-        osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
-        return True
+        for inv in self.browse(cr, uid, ids, context):
+            print inv.name, inv.amount_total
+            for line in inv.invoice_line:
+                print line.price_subtotal
+#        invoices = self.read(cr, uid, ids, ['state'])
+#        unlink_ids = []
+#        for t in invoices:
+#            if t['state'] in ('draft', 'cancel'):
+#                unlink_ids.append(t['id'])
+#            else:
+#                raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened or paid !'))
+#        osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+#        return True
+
+    #def unlink(self, cr, uid, ids, context=None):
+    #    invoices = self.read(cr, uid, ids, ['state'])
+    #    unlink_ids = []
+    #    for t in invoices:
+    #        if t['state'] in ('draft', 'cancel'):
+    #            unlink_ids.append(t['id'])
+    #        else:
+    #            raise osv.except_osv(_('Invalid action !'), _('Cannot delete invoice(s) that are already opened or paid !'))
+    #    osv.osv.unlink(self, cr, uid, unlink_ids, context=context)
+    #    return True
 
 #   def get_invoice_address(self, cr, uid, ids):
 #       res = self.pool.get('res.partner').address_get(cr, uid, [part], ['invoice'])
@@ -1127,14 +1143,14 @@ class account_invoice_tax(osv.osv):
                 if inv.type in ('out_invoice','in_invoice'):
                     val['base_code_id'] = tax['base_code_id']
                     val['tax_code_id'] = tax['tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_collected_id'] or line.account_id.id
                 else:
                     val['base_code_id'] = tax['ref_base_code_id']
                     val['tax_code_id'] = tax['ref_tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')})
+                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
+                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
                     val['account_id'] = tax['account_paid_id'] or line.account_id.id
 
                 key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
@@ -1148,6 +1164,8 @@ class account_invoice_tax(osv.osv):
 
         for t in tax_grouped.values():
             t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
+            t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
+            t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
         return tax_grouped
 
     def move_line_get(self, cr, uid, invoice_id):
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index cadf5d9c476..1000cef2156 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -11,8 +11,8 @@
                     <page string="Accounting">
                         <separator string="Sales Properties" colspan="2"/>
                         <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_account_income" attrs="{'readonly':[('sale_ok','=',0)]}" />
-                        <field name="property_account_expense" attrs="{'readonly':[('purchase_ok','=',0)]}" />
+                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('sale_ok','=',0)]}" />
+                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]" attrs="{'readonly':[('purchase_ok','=',0)]}" />
 
                         <separator string="Sale Taxes" colspan="2"/>
                         <separator string="Purchase Taxes" colspan="2"/>
@@ -33,8 +33,8 @@
                     <page string="Accounting">
                         <separator string="Sales Properties" colspan="2"/>
                         <separator string="Purchase Properties" colspan="2"/>
-                        <field name="property_account_income"/>
-                        <field name="property_account_expense"/>
+                        <field name="property_account_income" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_account_expense" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="supplier_taxes_id"/>
                         <field name="taxes_id"/>
                     </page>
@@ -53,8 +53,8 @@
                 <form position="inside">
                     <group col="2" colspan="2">
                         <separator string="Accounting Properties" colspan="2"/>
-                        <field name="property_account_income_categ"/>
-                        <field name="property_account_expense_categ"/>
+                        <field name="property_account_income_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_account_expense_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 379e01cdf6f..64db67efea5 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -57,7 +57,7 @@ class account_balance(report_sxw.rml_parse):
 
         def get_periods(self, form):
             result=''
-            if form.has_key('periods'):
+            if form.has_key('periods') and form['periods'][0][2]:
                 period_ids = ",".join([str(x) for x in form['periods'][0][2] if x])
                 self.cr.execute("select name from account_period where id in (%s)" % (period_ids))
                 res=self.cr.fetchall()
diff --git a/addons/account/report/tax_report.rml b/addons/account/report/tax_report.rml
index 1f17874129a..9cdba22c43f 100644
--- a/addons/account/report/tax_report.rml
+++ b/addons/account/report/tax_report.rml
@@ -126,13 +126,13 @@
            <para style="P12">Code</para>
         </td>
         <td>
-           <para style="P12a">Débit</para>
+           <para style="P12a">Debit</para>
         </td>
         <td>
-           <para style="P12a">Crédit</para>
+           <para style="P12a">Credit</para>
         </td>
         <td>
-           <para style="P12a">Solde</para>
+           <para style="P12a">Tax Amount</para>
         </td>
       </tr>
     
diff --git a/addons/account/report/transfer.xsl b/addons/account/report/transfer.xsl
index cd27805126a..1447fcef6a4 100644
--- a/addons/account/report/transfer.xsl
+++ b/addons/account/report/transfer.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 	<xsl:variable name="page_format">a4_normal</xsl:variable>
 
diff --git a/addons/account/wizard/wizard_central_journal.py b/addons/account/wizard/wizard_central_journal.py
index de57c821d31..1b8c4ba525a 100644
--- a/addons/account/wizard/wizard_central_journal.py
+++ b/addons/account/wizard/wizard_central_journal.py
@@ -35,6 +35,26 @@ fields = {
 }
 
 
+def _check_data(self, cr, uid, data, *args):
+    period_id = data['form']['period_id'][0][2]
+    journal_id=data['form']['journal_id'][0][2]
+
+    if type(period_id)==type([]):
+        
+        ids_final = []
+
+        for journal in journal_id:
+            for period in period_id:
+                ids_journal_period = pooler.get_pool(cr.dbname).get('account.journal.period').search(cr,uid, [('journal_id','=',journal),('period_id','=',period)])
+
+                if ids_journal_period:
+                    ids_final.append(ids_journal_period)
+
+            if not ids_final:
+                raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
+    return data['form']
+
+
 class wizard_print_journal(wizard.interface):
     states = {
         'init': {
@@ -42,7 +62,7 @@ class wizard_print_journal(wizard.interface):
             'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
         },
         'print': {
-            'actions': [],
+            'actions': [_check_data],
             'result': {'type':'print', 'report':'account.central.journal.wiz', 'state':'end'},
         },
     }
diff --git a/addons/account/wizard/wizard_fiscalyear_close.py b/addons/account/wizard/wizard_fiscalyear_close.py
index feba99a4ccb..7cd560e7b44 100644
--- a/addons/account/wizard/wizard_fiscalyear_close.py
+++ b/addons/account/wizard/wizard_fiscalyear_close.py
@@ -63,7 +63,8 @@ def _data_save(self, cr, uid, data, context):
 
     period = pool.get('account.period').browse(cr, uid, data['form']['period_id'], context=context)
     new_fyear = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy2_id'], context=context)
-
+    old_fyear = pool.get('account.fiscalyear').browse(cr, uid, data['form']['fy_id'], context=context)
+    
     new_journal = data['form']['journal_id']
     new_journal = pool.get('account.journal').browse(cr, uid, new_journal, context=context)
 
@@ -192,8 +193,12 @@ def _data_save(self, cr, uid, data, context):
                 offset += limit
 
     ids = pool.get('account.move.line').search(cr, uid, [('journal_id','=',new_journal.id),
-        ('period_id.fiscalyear_id','=',new_fyear.id)])
+        ('period_id.fiscalyear_id','=',old_fyear.id)])
     context['fy_closing'] = True
+    if not ids:
+        raise wizard.except_wizard(_('UserError'),
+                _('The old fiscal year does not have any entry to reconcile!'))
+
     pool.get('account.move.line').reconcile(cr, uid, ids, context=context)
     new_period = data['form']['period_id']
     ids = pool.get('account.journal.period').search(cr, uid, [('journal_id','=',new_journal.id),('period_id','=',new_period)])
diff --git a/addons/account/wizard/wizard_general_journal.py b/addons/account/wizard/wizard_general_journal.py
index 9722fb84918..fe9c1d1141f 100644
--- a/addons/account/wizard/wizard_general_journal.py
+++ b/addons/account/wizard/wizard_general_journal.py
@@ -34,6 +34,24 @@ fields = {
   'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True},
 }
 
+def _check_data(self, cr, uid, data, *args):
+    period_id = data['form']['period_id'][0][2]
+    journal_id=data['form']['journal_id'][0][2]
+
+    if type(period_id)==type([]):
+        
+        ids_final = []
+
+        for journal in journal_id:
+            for period in period_id:
+                ids_journal_period = pooler.get_pool(cr.dbname).get('account.journal.period').search(cr,uid, [('journal_id','=',journal),('period_id','=',period)])
+
+                if ids_journal_period:
+                    ids_final.append(ids_journal_period)
+
+            if not ids_final:
+                raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
+    return data['form']
 
 class wizard_print_journal(wizard.interface):
     states = {
@@ -42,7 +60,7 @@ class wizard_print_journal(wizard.interface):
             'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
         },
         'print': {
-            'actions': [],
+            'actions': [_check_data],
             'result': {'type':'print', 'report':'account.general.journal.wiz', 'state':'end'},
         },
     }
diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py
index ab48c879d96..6b2ea42d66c 100644
--- a/addons/account/wizard/wizard_print_journal.py
+++ b/addons/account/wizard/wizard_print_journal.py
@@ -43,6 +43,25 @@ fields = {
 
 }
 
+def _check_data(self, cr, uid, data, *args):
+    period_id = data['form']['period_id'][0][2]
+    journal_id=data['form']['journal_id'][0][2]
+
+    if type(period_id)==type([]):
+        
+        ids_final = []
+
+        for journal in journal_id:
+            for period in period_id:
+                ids_journal_period = pooler.get_pool(cr.dbname).get('account.journal.period').search(cr,uid, [('journal_id','=',journal),('period_id','=',period)])
+
+                if ids_journal_period:
+                    ids_final.append(ids_journal_period)
+
+            if not ids_final:
+                raise wizard.except_wizard(_('No Data Available'), _('No records found for your selection!'))
+    return data['form']
+
 class wizard_print_journal(wizard.interface):
     states = {
         'init': {
@@ -50,7 +69,7 @@ class wizard_print_journal(wizard.interface):
             'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))},
         },
         'print': {
-            'actions': [],
+            'actions': [_check_data],
             'result': {'type':'print', 'report':'account.journal.period.print.wiz', 'state':'end'},
         },
     }
diff --git a/addons/account_payment/i18n/account_payment.pot b/addons/account_payment/i18n/account_payment.pot
index b933350e029..4e8f4fa81cb 100644
--- a/addons/account_payment/i18n/account_payment.pot
+++ b/addons/account_payment/i18n/account_payment.pot
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/ar_AR.po b/addons/account_payment/i18n/ar_AR.po
index e8e8f061c6f..a2fde289957 100644
--- a/addons/account_payment/i18n/ar_AR.po
+++ b/addons/account_payment/i18n/ar_AR.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/bg_BG.po b/addons/account_payment/i18n/bg_BG.po
index 496f8befeb3..2b05a633e9a 100644
--- a/addons/account_payment/i18n/bg_BG.po
+++ b/addons/account_payment/i18n/bg_BG.po
@@ -419,7 +419,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/bs_BS.po b/addons/account_payment/i18n/bs_BS.po
index 9c000f605d9..36c103f925d 100644
--- a/addons/account_payment/i18n/bs_BS.po
+++ b/addons/account_payment/i18n/bs_BS.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/ca_ES.po b/addons/account_payment/i18n/ca_ES.po
index ea9e971a9f3..da1b47fb96b 100644
--- a/addons/account_payment/i18n/ca_ES.po
+++ b/addons/account_payment/i18n/ca_ES.po
@@ -419,7 +419,7 @@ msgstr "Codi"
 
 #. 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 receipent about this oder?'"
+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 "Utilitzat com el missatge entre client que ordena  l'actual companyia. Descriu 'Què vol dir-li al receptor referent a aquesta ordre?'"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/cs_CS.po b/addons/account_payment/i18n/cs_CS.po
index 48c83d7cedb..3ca0291b7be 100644
--- a/addons/account_payment/i18n/cs_CS.po
+++ b/addons/account_payment/i18n/cs_CS.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/cs_CZ.po b/addons/account_payment/i18n/cs_CZ.po
index 58a66e8b3db..9d4bec5fab9 100644
--- a/addons/account_payment/i18n/cs_CZ.po
+++ b/addons/account_payment/i18n/cs_CZ.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/de_DE.po b/addons/account_payment/i18n/de_DE.po
index 167aac7027e..cbaee32e087 100644
--- a/addons/account_payment/i18n/de_DE.po
+++ b/addons/account_payment/i18n/de_DE.po
@@ -419,7 +419,7 @@ msgstr "Kurzbezeichnung"
 
 #. 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 receipent about this oder?'"
+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 "Verwendungszweck"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/es_AR.po b/addons/account_payment/i18n/es_AR.po
index 8f0afcab84f..a5a69a06237 100644
--- a/addons/account_payment/i18n/es_AR.po
+++ b/addons/account_payment/i18n/es_AR.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/es_ES.po b/addons/account_payment/i18n/es_ES.po
index c14a635bf57..2619fb4982a 100644
--- a/addons/account_payment/i18n/es_ES.po
+++ b/addons/account_payment/i18n/es_ES.po
@@ -419,7 +419,7 @@ msgstr "Código"
 
 #. 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 receipent about this oder?'"
+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 "Utilizado como el mensaje entre cliente que ordena y la actual compañía. Describe '¿Qué quiere decirle al receptor sobre esta orden?'"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/et_EE.po b/addons/account_payment/i18n/et_EE.po
index abbf92dc49e..ef285874358 100644
--- a/addons/account_payment/i18n/et_EE.po
+++ b/addons/account_payment/i18n/et_EE.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/fr_FR.po b/addons/account_payment/i18n/fr_FR.po
index ee128c7c5b3..120c86598f0 100644
--- a/addons/account_payment/i18n/fr_FR.po
+++ b/addons/account_payment/i18n/fr_FR.po
@@ -419,7 +419,7 @@ msgstr "Code"
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/hr_HR.po b/addons/account_payment/i18n/hr_HR.po
index de8cc082ee1..2479f4e5c06 100644
--- a/addons/account_payment/i18n/hr_HR.po
+++ b/addons/account_payment/i18n/hr_HR.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/hu_HU.po b/addons/account_payment/i18n/hu_HU.po
index 14a6bc05c81..abc435b7189 100644
--- a/addons/account_payment/i18n/hu_HU.po
+++ b/addons/account_payment/i18n/hu_HU.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/it_IT.po b/addons/account_payment/i18n/it_IT.po
index 7696ae3fe6c..96f9d2d657b 100644
--- a/addons/account_payment/i18n/it_IT.po
+++ b/addons/account_payment/i18n/it_IT.po
@@ -419,7 +419,7 @@ msgstr "Codice"
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/lt_LT.po b/addons/account_payment/i18n/lt_LT.po
index 4dfe7861866..e44d2da9796 100644
--- a/addons/account_payment/i18n/lt_LT.po
+++ b/addons/account_payment/i18n/lt_LT.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/nl_BE.po b/addons/account_payment/i18n/nl_BE.po
index ffc77a37632..52efc824ca6 100644
--- a/addons/account_payment/i18n/nl_BE.po
+++ b/addons/account_payment/i18n/nl_BE.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/nl_NL.po b/addons/account_payment/i18n/nl_NL.po
index 9a4c54cbadc..b2e8446e188 100644
--- a/addons/account_payment/i18n/nl_NL.po
+++ b/addons/account_payment/i18n/nl_NL.po
@@ -419,7 +419,7 @@ msgstr "Code"
 
 #. 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 receipent about this oder?'"
+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 "Wordt gebruikt als het bericht tussen de klant en het bedrijf. Zoiets als 'Wat wilt u zeggen tegen de ontvanger van deze order'"
 
 #. module: account_payment
diff --git a/addons/account_payment/i18n/pl_PL.po b/addons/account_payment/i18n/pl_PL.po
index 9c55999e30b..55bea273bb2 100644
--- a/addons/account_payment/i18n/pl_PL.po
+++ b/addons/account_payment/i18n/pl_PL.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/pt_BR.po b/addons/account_payment/i18n/pt_BR.po
index f5e7769f644..aa1c75eab40 100644
--- a/addons/account_payment/i18n/pt_BR.po
+++ b/addons/account_payment/i18n/pt_BR.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/pt_PT.po b/addons/account_payment/i18n/pt_PT.po
index a4b10c8eefa..9b8c54d67c6 100644
--- a/addons/account_payment/i18n/pt_PT.po
+++ b/addons/account_payment/i18n/pt_PT.po
@@ -419,7 +419,7 @@ msgstr "Código"
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/ro_RO.po b/addons/account_payment/i18n/ro_RO.po
index 2ab6df6d77e..7400550f719 100644
--- a/addons/account_payment/i18n/ro_RO.po
+++ b/addons/account_payment/i18n/ro_RO.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/ru_RU.po b/addons/account_payment/i18n/ru_RU.po
index d155552305f..fe98dae12a8 100644
--- a/addons/account_payment/i18n/ru_RU.po
+++ b/addons/account_payment/i18n/ru_RU.po
@@ -419,7 +419,7 @@ msgstr "Код"
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/sl_SL.po b/addons/account_payment/i18n/sl_SL.po
index 9249f55fbb0..81611e07952 100644
--- a/addons/account_payment/i18n/sl_SL.po
+++ b/addons/account_payment/i18n/sl_SL.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/sv_SE.po b/addons/account_payment/i18n/sv_SE.po
index ae6fa9e4165..b1543e60ea8 100644
--- a/addons/account_payment/i18n/sv_SE.po
+++ b/addons/account_payment/i18n/sv_SE.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/sv_SV.po b/addons/account_payment/i18n/sv_SV.po
index 21810772237..b8b23aed00b 100644
--- a/addons/account_payment/i18n/sv_SV.po
+++ b/addons/account_payment/i18n/sv_SV.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/tr_TR.po b/addons/account_payment/i18n/tr_TR.po
index 7a749a737fb..82f0ef3384d 100644
--- a/addons/account_payment/i18n/tr_TR.po
+++ b/addons/account_payment/i18n/tr_TR.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/uk_UK.po b/addons/account_payment/i18n/uk_UK.po
index e592d6dacfa..31615817eac 100644
--- a/addons/account_payment/i18n/uk_UK.po
+++ b/addons/account_payment/i18n/uk_UK.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/zh_CN.po b/addons/account_payment/i18n/zh_CN.po
index 8c05c8b897d..029fc8741ed 100644
--- a/addons/account_payment/i18n/zh_CN.po
+++ b/addons/account_payment/i18n/zh_CN.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/i18n/zh_TW.po b/addons/account_payment/i18n/zh_TW.po
index f31793b5536..4ffec1503bf 100644
--- a/addons/account_payment/i18n/zh_TW.po
+++ b/addons/account_payment/i18n/zh_TW.po
@@ -418,7 +418,7 @@ msgstr ""
 
 #. 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 receipent about this oder?'"
+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
diff --git a/addons/account_payment/payment.py b/addons/account_payment/payment.py
index 08f5615242e..e01ace8c0d7 100644
--- a/addons/account_payment/payment.py
+++ b/addons/account_payment/payment.py
@@ -372,7 +372,7 @@ class payment_line(osv.osv):
 
     _columns = {
         'name': fields.char('Your Reference', size=64, required=True),
-        'communication': fields.char('Communication', size=64, required=True,help="Used as the message between ordering customer and current company.Depicts 'What do you want to say to the receipent about this oder?'"),
+        'communication': fields.char('Communication', size=64, required=True,help="Used as the message between ordering customer and current company. Depicts 'What do you want to say to the recipient about this order ?'"),
         'communication2': fields.char('Communication 2', size=64,help='The successor message of Communication.'),
         'move_line_id': fields.many2one('account.move.line','Entry line', domain=[('reconcile_id','=', False), ('account_id.type', '=','payable')],help='This Entry Line will be referred for the information of the ordering customer.'),
         'amount_currency': fields.float('Amount in Partner Currency', digits=(16,2),
diff --git a/addons/account_report/i18n/fr_FR.po b/addons/account_report/i18n/fr_FR.po
index 32910d1f907..6ca96f3f76d 100644
--- a/addons/account_report/i18n/fr_FR.po
+++ b/addons/account_report/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-02-06 15:06:40+0000\n"
-"PO-Revision-Date: 2009-02-06 15:06:40+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-01-23 14:23+0000\n"
+"PO-Revision-Date: 2009-02-27 11:57+0000\n"
+"Last-Translator: Olivier (OpenERP) <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-02-27 12:00+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_report
 #: field:account.report.history,name:0
@@ -25,7 +26,12 @@ msgstr "Indicateur"
 #. module: account_report
 #: wizard_field:print.indicators.pdf,init,file:0
 msgid "Select a PDF File"
-msgstr ""
+msgstr "Sélectionnez un fichier PDF"
+
+#. module: account_report
+#: selection:account.report.report,type:0
+msgid "Fiscal statement"
+msgstr "Extrait fiscal"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -33,16 +39,20 @@ msgid "Operators:"
 msgstr "Opérateurs"
 
 #. 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; as an "
+"array otherwise."
+msgstr ""
+"Si le champ à la valeur 'Vrai', l'information sera imprimée comme un Graphe, "
+"et sinon comme un tableau."
+
+#. 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 ""
-
-#. module: account_report
 #: view:account.report.report:0
 msgid "Account Debit:"
 msgstr ""
@@ -53,14 +63,9 @@ msgid "Others"
 msgstr "Autres"
 
 #. module: account_report
-#: view:account.report.report:0
-msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
-msgstr ""
-
-#. module: account_report
 #: rml:print.indicators:0
 msgid "Tabular Summary"
-msgstr ""
+msgstr "Résumé tabulaire"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -98,6 +103,12 @@ msgstr "Mauvais"
 #: 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
+#: field:account.report.report,child_ids:0
+msgid "Childs"
+msgstr "Enfants"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -117,7 +128,7 @@ msgstr "Très mauvais"
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.account_report_history_record_structure
 msgid "Indicator history"
-msgstr ""
+msgstr "Historique de l'Indicateur"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -137,18 +148,13 @@ msgstr "Extraits fiscaux"
 #. module: account_report
 #: wizard_button:print.indicators,init,next:0
 msgid "Next"
-msgstr ""
-
-#. module: account_report
-#: model:ir.module.module,shortdesc:account_report.module_meta_information
-msgid "Reporting for accounting"
-msgstr ""
+msgstr "Suivant"
 
 #. module: account_report
 #: wizard_button:print.indicators,next,print:0
 #: wizard_button:print.indicators.pdf,init,print:0
 msgid "Print"
-msgstr ""
+msgstr "Imprimer"
 
 #. module: account_report
 #: field:account.report.report,type:0
@@ -158,7 +164,7 @@ msgstr "Type"
 #. module: account_report
 #: model:ir.actions.report.xml,name:account_report.report_indicator_pdf
 msgid "Print Indicators in PDF"
-msgstr ""
+msgstr "Imprimer les Indicateurs dans le fichier PDF"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -175,7 +181,7 @@ msgstr "Bon"
 #: code:addons/account_report/account.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Erreur !"
 
 #. module: account_report
 #: view:account.report.history:0
@@ -188,14 +194,19 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
 #. 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
+#: help:account.report.report,disp_tree:0
+msgid ""
+"When the indicators will be printed, if one indicator is set with this field "
+"to True, then it will display one more graph with all its children in tree"
 msgstr ""
+"Lorsque les indicateurs seront imprimés, si un indicateur a la valeur 'Vrai' "
+"pour ce champ, alors, il affichera un ou plusieurs graphes avec tous ses "
+"fils dans l'arborescence."
 
 #. module: account_report
 #: view:account.report.report:0
@@ -211,6 +222,13 @@ msgstr ""
 #: 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
+#: help:account.report.report,badness_limit:0
+msgid "This Value depicts the limit of badness."
+msgstr ""
 
 #. module: account_report
 #: view:account.report.report:0
@@ -229,6 +247,12 @@ msgid "Note"
 msgstr "Note"
 
 #. 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 "Others reportings"
+msgstr "Autres rapports"
+
+#. module: account_report
 #: rml:accounting.report:0
 #: rml:print.indicators:0
 msgid "Currency:"
@@ -240,11 +264,6 @@ 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"
@@ -265,9 +284,9 @@ msgid "Display Tree"
 msgstr ""
 
 #. module: account_report
-#: selection:print.indicators,init,select_base:0
-msgid "Based On Fiscal Years"
-msgstr ""
+#: field:account.report.report,disp_graph:0
+msgid "Display as a Graph"
+msgstr "Afficher en Graphe"
 
 #. module: account_report
 #: model:ir.model,name:account_report.model_account_report_report
@@ -280,9 +299,20 @@ msgid "Account Balance:"
 msgstr ""
 
 #. module: account_report
+#: help:account.report.report,goodness_limit:0
+msgid "This Value depicts the limit of goodness."
+msgstr ""
+
+#. module: account_report
 #: rml:print.indicators:0
 msgid "Expression :"
-msgstr ""
+msgstr "Expression :"
+
+#. module: account_report
+#: model:ir.actions.act_window,name:account_report.account_report_history_record
+#: model:ir.ui.menu,name:account_report.menu_account_report_history_record
+msgid "All Indicators History"
+msgstr "Historique de tous les Indicateurs"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -319,7 +349,7 @@ msgstr ""
 #. module: account_report
 #: field:account.report.history,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Période"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -336,22 +366,25 @@ msgstr "Légende des opérateurs"
 #: wizard_button:print.indicators,next,end:0
 #: wizard_button:print.indicators.pdf,init,end:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuler"
 
 #. module: account_report
-#: field:account.report.report,child_ids:0
-msgid "Children"
+#: view:account.report.report:0
+msgid "balance(['ACCOUNT_CODE',],fiscalyear)"
 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 !"
+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 ""
+#: selection:print.indicators,init,select_base:0
+msgid "Based On Fiscal Years"
+msgstr "Basé sur les Années Fiscales"
 
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_print_indicators
@@ -359,7 +392,7 @@ msgstr ""
 #: wizard_view:print.indicators,init:0
 #: wizard_view:print.indicators,next:0
 msgid "Print Indicators"
-msgstr ""
+msgstr "Imprimer les Indicateurs"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -375,7 +408,7 @@ msgstr "Date d'impression"
 #. module: account_report
 #: model:ir.actions.wizard,name:account_report.wizard_indicators_with_pdf
 msgid "Indicators in PDF"
-msgstr ""
+msgstr "Indicateurs en PDF"
 
 #. module: account_report
 #: rml:accounting.report:0
@@ -394,20 +427,16 @@ 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."
+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 ""
+msgstr ")"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree_view_fiscal
@@ -418,18 +447,18 @@ msgstr "Rapport des extraits fiscaux"
 #. module: account_report
 #: selection:print.indicators,init,select_base:0
 msgid "Based on Fiscal Periods"
-msgstr ""
+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 ""
+msgstr "Indicateurs"
 
 #. module: account_report
 #: wizard_view:print.indicators.pdf,init:0
 msgid "Print Indicators with PDF"
-msgstr ""
+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
@@ -447,13 +476,17 @@ msgstr "Nom"
 #. module: account_report
 #: wizard_field:print.indicators,next,base_selection:0
 msgid "Select Criteria"
-msgstr ""
+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!"
+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
@@ -463,7 +496,7 @@ msgstr ""
 #. module: account_report
 #: field:account.report.history,fiscalyear_id:0
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Année Fiscale"
 
 #. module: account_report
 #: model:ir.actions.act_window,name:account_report.action_account_report_tree
@@ -476,22 +509,17 @@ msgstr "Personnaliser un rapport"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Page"
-msgstr ""
+msgstr "Page"
 
 #. module: account_report
 #: selection:account.report.report,type:0
 msgid "View"
-msgstr ""
+msgstr "Vue"
 
 #. module: account_report
 #: rml:print.indicators:0
 msgid "Indicators -"
-msgstr ""
-
-#. 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 ""
+msgstr "Indicateurs -"
 
 #. module: account_report
 #: view:account.report.report:0
@@ -511,18 +539,4 @@ msgstr "Montant"
 #. module: account_report
 #: rml:print.indicators:0
 msgid "1cm 27.7cm 20cm 27.7cm"
-msgstr ""
-
-#. 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 ""
-
+msgstr "1cm 27.7cm 20cm 27.7cm"
diff --git a/addons/account_reporting/i18n/fr_FR.po b/addons/account_reporting/i18n/fr_FR.po
index e651e0e02fe..4327bdac9c4 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.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-02-06 15:06:40+0000\n"
-"PO-Revision-Date: 2009-02-06 15:06:40+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-01-28 00:58+0000\n"
+"PO-Revision-Date: 2009-02-27 12:01+0000\n"
+"Last-Translator: Olivier (OpenERP) <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-02-27 12:04+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
@@ -69,7 +73,7 @@ msgstr ""
 #. module: account_reporting
 #: help:account.account.balancesheet.report,init,periods:0
 msgid "All periods if empty"
-msgstr ""
+msgstr "Toutes les périodes si vide"
 
 #. module: account_reporting
 #: field:account.report.bs,color_font:0
@@ -83,7 +87,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 ""
 
@@ -151,7 +156,7 @@ msgstr ""
 #. module: account_reporting
 #: model:ir.model,name:account_reporting.model_color_rml
 msgid "Rml Colors"
-msgstr ""
+msgstr "Couleurs RML"
 
 #. module: account_reporting
 #: model:ir.module.module,shortdesc:account_reporting.module_meta_information
@@ -181,7 +186,7 @@ msgstr "Times-Bold"
 #. module: account_reporting
 #: view:account.report.bs:0
 msgid "General"
-msgstr ""
+msgstr "Général"
 
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,fiscalyear:0
@@ -197,7 +202,7 @@ msgstr "Comptes"
 #. module: account_reporting
 #: wizard_field:account.account.balancesheet.report,init,periods:0
 msgid "Periods"
-msgstr ""
+msgstr "Périodes"
 
 #. module: account_reporting
 #: field:account.report.bs,color_back:0
@@ -207,7 +212,7 @@ msgstr "Couleur de fond"
 #. module: account_reporting
 #: field:account.report.bs,child_id:0
 msgid "Children"
-msgstr ""
+msgstr "Fils"
 
 #. module: account_reporting
 #: wizard_button:account.account.balancesheet.report,init,end:0
@@ -233,4 +238,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 992b7bad279..cbba448b097 100644
--- a/addons/account_tax_include/i18n/fr_FR.po
+++ b/addons/account_tax_include/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-02-06 15:06:40+0000\n"
-"PO-Revision-Date: 2009-02-06 15:06:40+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-01-23 14:23+0000\n"
+"PO-Revision-Date: 2009-02-27 12:02+0000\n"
+"Last-Translator: Olivier (OpenERP) <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-02-27 12:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
@@ -21,14 +22,14 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Méthode de prix"
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Tax exclue"
 
 #. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Sous-Total"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
@@ -36,17 +37,6 @@ msgid "Tax included"
 msgstr "Tax inclue"
 
 #. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax exclue"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Méthode de prix"
diff --git a/addons/account_voucher/i18n/fr_FR.po b/addons/account_voucher/i18n/fr_FR.po
index 696e270871a..e170895f74b 100644
--- a/addons/account_voucher/i18n/fr_FR.po
+++ b/addons/account_voucher/i18n/fr_FR.po
@@ -6,30 +6,31 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-02-06 15:06:40+0000\n"
-"PO-Revision-Date: 2009-02-06 15:06:40+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-01-28 00:58+0000\n"
+"PO-Revision-Date: 2009-02-27 12:20+0000\n"
+"Last-Translator: Olivier (OpenERP) <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-02-27 12:24+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
 #: field:account.voucher,type:0
 #: field:account.voucher.line,type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "State :"
-msgstr ""
+msgstr "État"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher
 msgid "Accounting Voucher"
-msgstr ""
+msgstr "Souche comptable"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
@@ -39,7 +40,7 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.actions.report.xml,name:account_voucher.report_account_voucher
 msgid "Voucher Report"
-msgstr ""
+msgstr "Rapport sur les Souches"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_payments_bankpay_voucher_list
@@ -47,27 +48,27 @@ msgstr ""
 #: model:ir.actions.act_window,name:account_voucher.action_payments_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_action_payments_voucher_list
 msgid "Payment Vouchers"
-msgstr ""
+msgstr "Souches de Paiement"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Other Info"
-msgstr ""
+msgstr "Autres Informations"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Create"
-msgstr ""
+msgstr "Créer"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "Ref. :"
-msgstr ""
+msgstr "Réf. :"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_bakreceipt_voucher_list
 msgid "Bank Receipts"
-msgstr ""
+msgstr "Reçus bancaires"
 
 #. module: account_voucher
 #: constraint:ir.ui.view:0
@@ -77,33 +78,33 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "Particulars"
-msgstr ""
+msgstr "Particuliers"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_performa_cash_rec_voucher_form
 msgid "Pro-forma Cash Receipt"
-msgstr ""
+msgstr "Reçu de Caisse Pro-forma"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "Receiver's Signature"
-msgstr ""
+msgstr "Signature du Receveur"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_rec_voucher_form
 msgid "New Cash Receipt"
-msgstr ""
+msgstr "Nouveau Reçu de Caisse"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 #: rml:voucher.cash_receipt:0
 msgid "Draft"
-msgstr ""
+msgstr "Brouillon"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_payments_bankpay_voucher_list
 msgid "Bank Payments"
-msgstr ""
+msgstr "Paiements bancaires"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -117,28 +118,31 @@ msgstr ""
 #: selection:account.voucher.line,type:0
 #: rml:voucher.cash_receipt:0
 msgid "Debit"
-msgstr ""
+msgstr "Débit"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_other_voucher_list
 #: model:ir.ui.menu,name:account_voucher.menu_action_other_voucher_list
 msgid "Other Vouchers"
-msgstr ""
+msgstr "Autres Souches"
 
 #. 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
 #: rml:voucher.cash_receipt:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: account_voucher
 #: model:ir.module.module,shortdesc:account_voucher.module_meta_information
 msgid "Accounting - Voucher Management"
-msgstr ""
+msgstr "Comptabilité - Gestion des Souches"
 
 #. module: account_voucher
 #: field:account.voucher,move_ids:0
@@ -160,43 +164,43 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_cancel_cash_rec_voucher_form
 msgid "Cancel Cash Receipt"
-msgstr ""
+msgstr "Annuler le Reçu de Caisse"
 
 #. module: account_voucher
 #: field:account.voucher.line,name:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: account_voucher
 #: field:account.voucher,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Devise"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_cashreceipt_voucher_list
 msgid "Cash Receipt"
-msgstr ""
+msgstr "Reçu de Caisse"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "Authorised Signatory"
-msgstr ""
+msgstr "Signataire Autorisé"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: model:ir.actions.act_window,name:account_voucher.action_voucher_list
 msgid "Vouchers"
-msgstr ""
+msgstr "Souches"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Mettre en Brouillon"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -208,17 +212,17 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_cash_pay_voucher_form
 msgid "New Cash Payment"
-msgstr ""
+msgstr "Nouveau Paiement de Caisse"
 
 #. module: account_voucher
 #: field:account.voucher,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Période"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_pay_voucher_form
 msgid "New Bank Payment"
-msgstr ""
+msgstr "Nouveau Paiement Bancaire"
 
 #. module: account_voucher
 #: view:account.account:0
@@ -228,28 +232,28 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher.line,ref:0
 msgid "Ref."
-msgstr ""
+msgstr "Réf."
 
 #. module: account_voucher
 #: field:account.voucher,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid ":"
-msgstr ""
+msgstr ":"
 
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_account_voucher_line
 msgid "Voucher Line"
-msgstr ""
+msgstr "Ligne de Souche"
 
 #. module: account_voucher
 #: selection:account.voucher,state:0
 #: rml:voucher.cash_receipt:0
 msgid "Posted"
-msgstr ""
+msgstr "Posté"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
@@ -260,7 +264,7 @@ msgstr ""
 #: field:account.voucher,account_id:0
 #: field:account.voucher.line,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Compte"
 
 #. module: account_voucher
 #: field:account.account,type1:0
@@ -270,12 +274,12 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: account_voucher
 #: field:account.voucher,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "Type de Référence"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -291,13 +295,13 @@ msgstr ""
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_receipt_cashreceipt_voucher_list
 msgid "Cash Receipts"
-msgstr ""
+msgstr "Reçus de Caisse"
 
 #. module: account_voucher
 #: field:account.voucher,amount:0
 #: field:account.voucher.line,amount:0
 msgid "Amount"
-msgstr ""
+msgstr "Montant"
 
 #. module: account_voucher
 #: field:account.account,diff:0
@@ -307,7 +311,7 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,reference:0
 msgid "Voucher Reference"
-msgstr ""
+msgstr "Référence de la Souche"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_vou_voucher_list
@@ -318,12 +322,12 @@ msgstr ""
 #. module: account_voucher
 #: selection:account.account,type1:0
 msgid "None"
-msgstr ""
+msgstr "Aucun"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Entry"
-msgstr ""
+msgstr "Entrée"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_posted_cash_rec_voucher_form
@@ -339,17 +343,17 @@ msgstr ""
 #: view:account.voucher:0
 #: field:account.voucher,payment_ids:0
 msgid "Voucher Lines"
-msgstr ""
+msgstr "Lignes de Souches"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "No."
-msgstr ""
+msgstr "N°"
 
 #. module: account_voucher
 #: field:account.voucher,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Société"
 
 #. module: account_voucher
 #: field:account.voucher,move_id:0
@@ -359,40 +363,40 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher,state:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: account_voucher
 #: selection:account.account,type1:0
 #: selection:account.voucher.line,type:0
 #: rml:voucher.cash_receipt:0
 msgid "Credit"
-msgstr ""
+msgstr "Crédit"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_view_bank_rec_voucher_form
 msgid "New Bank Receipt"
-msgstr ""
+msgstr "Nouveau Reçu Bancaire"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: selection:account.voucher,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Pro-forma"
 
 #. module: account_voucher
 #: model:ir.ui.menu,name:account_voucher.menu_action_payments_cashpay_voucher_list
 msgid "Cash Payments"
-msgstr ""
+msgstr "Paiements de Caisse"
 
 #. module: account_voucher
 #: field:account.voucher,number:0
 msgid "Number"
-msgstr ""
+msgstr "Nombre"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "Amount (in words) :"
-msgstr ""
+msgstr "Montant (en mots) :"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
@@ -408,12 +412,12 @@ msgstr ""
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Compte Analytique"
 
 #. module: account_voucher
 #: rml:voucher.cash_receipt:0
 msgid "Canceled"
-msgstr ""
+msgstr "Annulé"
 
 #. module: account_voucher
 #: field:account.account,open_bal:0
@@ -425,47 +429,46 @@ msgstr ""
 #: field:account.voucher.line,voucher_id:0
 #: model:res.request.link,name:account_voucher.req_link_voucher
 msgid "Voucher"
-msgstr ""
+msgstr "Souche"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: model:ir.actions.act_window,name:account_voucher.action_view_bank_pay_voucher_form
 #: rml:voucher.cash_receipt:0
 msgid "Bank Payment Voucher"
-msgstr ""
+msgstr "Souche de Paiement Bancaire"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: model:ir.actions.act_window,name:account_voucher.action_view_cash_pay_voucher_form
 #: rml:voucher.cash_receipt:0
 msgid "Cash Payment Voucher"
-msgstr ""
+msgstr "Souche de Paiement Bancaire"
 
 #. module: account_voucher
 #: view:account.voucher:0
 #: selection:account.voucher,state:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annulé"
 
 #. module: account_voucher
 #: field:account.voucher.line,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: account_voucher
 #: selection:account.voucher,type:0
 #: model:ir.actions.act_window,name:account_voucher.action_view_bank_rec_voucher_form
 #: rml:voucher.cash_receipt:0
 msgid "Bank Receipt Voucher"
-msgstr ""
+msgstr "Souche de Reçu Bancaire"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_receipt_bakreceipt_voucher_list
 msgid "Bank Receipt"
-msgstr ""
+msgstr "Reçu Bancaire"
 
 #. module: account_voucher
 #: field:account.voucher,journal_id:0
 msgid "Journal"
-msgstr ""
-
+msgstr "Journal"
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 7f5cf40cd32..350cc3f85b1 100755
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -49,7 +49,7 @@
 								<field name="state"/>
 								<button name="open_voucher" string="Pro-forma" states="draft" type="object"/>
 								<button name="proforma_voucher" string="Create" states="proforma" type="object"/>
-								<button name="cancel_voucher" string="Cancel" states="draft,proforma,posted" type="object"/>
+								<button name="cancel_voucher" string="Cancel" states="draft,proforma" type="object"/>
 								<button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
 							</group>
 						</page>
diff --git a/addons/analytic_journal_billing_rate/i18n/fr_FR.po b/addons/analytic_journal_billing_rate/i18n/fr_FR.po
index b826000abb6..7740922e623 100644
--- a/addons/analytic_journal_billing_rate/i18n/fr_FR.po
+++ b/addons/analytic_journal_billing_rate/i18n/fr_FR.po
@@ -6,14 +6,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-02-06 15:06:40+0000\n"
-"PO-Revision-Date: 2009-02-06 15:06:40+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-01-23 14:23+0000\n"
+"PO-Revision-Date: 2009-02-27 12:23+0000\n"
+"Last-Translator: Olivier (OpenERP) <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-02-27 12:32+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_journal_billing_rate
 #: constraint:ir.ui.view:0
@@ -21,42 +22,34 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,journal_id:0
-msgid "Analytic Journal"
-msgstr ""
+#: field:analytic_journal_rate_grid,rate_id:0
+msgid "Invoicing Rate"
+msgstr "Taux de Facturation"
 
 #. module: analytic_journal_billing_rate
 #: 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_journal_billing_rate
 #: view:analytic_journal_rate_grid:0
 msgid "Billing Rate per Journal for this Analytic Account"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,account_id:0
-msgid "Analytic Account"
-msgstr ""
+msgstr "Taux de Facturation par Journal pour ce Compte Analytique"
 
 #. module: analytic_journal_billing_rate
 #: model:ir.model,name:analytic_journal_billing_rate.model_analytic_journal_rate_grid
 msgid "Relation table between journals and billing rates"
-msgstr ""
+msgstr "Tableau de Relations entre les journaux et les taux de Facturations"
 
 #. module: analytic_journal_billing_rate
 #: field:account.analytic.account,journal_rate_ids:0
 msgid "Invoicing Rate per Journal"
-msgstr ""
-
-#. module: analytic_journal_billing_rate
-#: model:ir.module.module,shortdesc:analytic_journal_billing_rate.module_meta_information
-msgid "Analytic Journal Billing Rate"
-msgstr ""
+msgstr "Taux de Facturation par Journal"
 
 #. module: analytic_journal_billing_rate
-#: field:analytic_journal_rate_grid,rate_id:0
-msgid "Invoicing Rate"
-msgstr ""
-
+#: field:analytic_journal_rate_grid,journal_id:0
+msgid "Analytic Journal"
+msgstr "Journal Analytique"
diff --git a/addons/analytic_user_function/i18n/fr_FR.po b/addons/analytic_user_function/i18n/fr_FR.po
index 6d45f370fe4..ccbd9639926 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.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-02-06 15:06:40+0000\n"
-"PO-Revision-Date: 2009-02-06 15:06:40+0000\n"
-"Last-Translator: <>\n"
+"POT-Creation-Date: 2009-01-23 14:23+0000\n"
+"PO-Revision-Date: 2009-02-27 12:45+0000\n"
+"Last-Translator: Olivier (OpenERP) <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-02-27 12:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic_user_function
 #: constraint:ir.ui.view:0
@@ -21,43 +22,37 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
 #. 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"
+#: 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: analytic_user_function
 #: field:analytic_user_funct_grid,product_id:0
 msgid "Product"
-msgstr ""
-
-#. module: analytic_user_function
-#: field:analytic_user_funct_grid,account_id:0
-msgid "Analytic Account"
-msgstr ""
+msgstr "Produit"
 
 #. module: analytic_user_function
 #: view:account.analytic.account:0
 #: field:account.analytic.account,user_product_ids:0
 msgid "Users/Products Rel."
-msgstr ""
+msgstr "Relation Utilisateurs/Produits"
 
 #. module: analytic_user_function
 #: field:analytic_user_funct_grid,user_id:0
 msgid "User"
-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 !"
+msgstr "Utilisateur"
 
 #. module: analytic_user_function
-#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
-msgid "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"
 
 #. module: analytic_user_function
 #: view:analytic_user_funct_grid:0
 msgid "User's Product for this Analytic Account"
-msgstr ""
-
+msgstr "Produit de l'Utilisateur pour ce Compte Analytique"
diff --git a/addons/auction/report/ach_bordereau.xsl b/addons/auction/report/ach_bordereau.xsl
index e95eddfe35d..6aa9f36e299 100644
--- a/addons/auction/report/ach_bordereau.xsl
+++ b/addons/auction/report/ach_bordereau.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 
 
diff --git a/addons/auction/report/ach_bordereau_photo.xsl b/addons/auction/report/ach_bordereau_photo.xsl
index 22526d37883..b1ed3340d7a 100644
--- a/addons/auction/report/ach_bordereau_photo.xsl
+++ b/addons/auction/report/ach_bordereau_photo.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 
 	<xsl:template match="/">
diff --git a/addons/auction/report/bids.xsl b/addons/auction/report/bids.xsl
index 829cd2b4079..b1552dedc7c 100644
--- a/addons/auction/report/bids.xsl
+++ b/addons/auction/report/bids.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 
 	<xsl:template match="/">
diff --git a/addons/auction/report/catalog.xsl b/addons/auction/report/catalog.xsl
index 29ba5e57b9b..29c5da5cab4 100644
--- a/addons/auction/report/catalog.xsl
+++ b/addons/auction/report/catalog.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 	<xsl:variable name="page_format">a4_normal</xsl:variable>
 
diff --git a/addons/auction/report/deposit.xsl b/addons/auction/report/deposit.xsl
index 2ca08445726..3573cce5a4e 100644
--- a/addons/auction/report/deposit.xsl
+++ b/addons/auction/report/deposit.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 
 	<xsl:template match="/">
diff --git a/addons/auction/report/lots_bids_phone.xsl b/addons/auction/report/lots_bids_phone.xsl
index 715114b20c1..4e22235c042 100644
--- a/addons/auction/report/lots_bids_phone.xsl
+++ b/addons/auction/report/lots_bids_phone.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:template match="/">
 		<xsl:apply-templates select="lots"/>
 	</xsl:template>
diff --git a/addons/auction/report/lots_bids_phone2.xsl b/addons/auction/report/lots_bids_phone2.xsl
index b8445998caf..27c57f475e2 100644
--- a/addons/auction/report/lots_bids_phone2.xsl
+++ b/addons/auction/report/lots_bids_phone2.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 
 	<xsl:template match="/">
 		<xsl:apply-templates select="lots"/>
diff --git a/addons/auction/report/lots_deposit.xsl b/addons/auction/report/lots_deposit.xsl
index ebf39458393..1b88f934be2 100644
--- a/addons/auction/report/lots_deposit.xsl
+++ b/addons/auction/report/lots_deposit.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 
 	<xsl:template match="/">
diff --git a/addons/auction/report/lots_list.xsl b/addons/auction/report/lots_list.xsl
index 4da62182d6d..96756838da9 100644
--- a/addons/auction/report/lots_list.xsl
+++ b/addons/auction/report/lots_list.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:template match="/">
 		<xsl:apply-templates select="lots"/>
 	</xsl:template>
diff --git a/addons/auction/report/lots_with_vat.xsl b/addons/auction/report/lots_with_vat.xsl
index 60c262dcee7..1dd6bda428b 100644
--- a/addons/auction/report/lots_with_vat.xsl
+++ b/addons/auction/report/lots_with_vat.xsl
@@ -3,7 +3,7 @@
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-    <xsl:import href="../../custom/corporate_defaults.xsl"/>
+    <xsl:import href="../../base/report/corporate_defaults.xsl"/>
     <xsl:import href="../../base/report/rml_template.xsl"/>
     <xsl:variable name="page_format">a4_normal</xsl:variable>
 
diff --git a/addons/auction/report/total.xsl b/addons/auction/report/total.xsl
index 265c880b71c..41d44bc2e65 100644
--- a/addons/auction/report/total.xsl
+++ b/addons/auction/report/total.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 
 	<xsl:template match="/">
 		<xsl:apply-templates select="report"/>
diff --git a/addons/auction/report/vnd_bordereau.xsl b/addons/auction/report/vnd_bordereau.xsl
index 0d297f77b51..356f069dfa8 100644
--- a/addons/auction/report/vnd_bordereau.xsl
+++ b/addons/auction/report/vnd_bordereau.xsl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 		<xsl:import href="../../base/report/rml_template.xsl"/>
 
 	<xsl:template match="/">
diff --git a/addons/base_contact/base_contact.py b/addons/base_contact/base_contact.py
index a90411c20b9..48d001a4805 100644
--- a/addons/base_contact/base_contact.py
+++ b/addons/base_contact/base_contact.py
@@ -23,7 +23,6 @@
 import netsvc
 from osv import fields, osv
 
-
 class res_partner_contact(osv.osv):
     _name = "res.partner.contact"
     _description = "res.partner.contact"
diff --git a/addons/base_vat/partner.py b/addons/base_vat/partner.py
index 7abf5a7df63..fc05376a2ce 100644
--- a/addons/base_vat/partner.py
+++ b/addons/base_vat/partner.py
@@ -47,7 +47,8 @@ class res_partner(osv.osv):
                 continue    #FIXME return False? empty vat numbre is invalid?
 
             vat_country, vat_number = partner.vat[:2].lower(), partner.vat[2:]
-            
+            if vat_number.find(' ') != -1:
+                return False 
             check = getattr(self, 'check_vat_' + vat_country, lambda vn: False)
             if not check(vat_number):
                 return False
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index bee8b550817..0d82951eb7d 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -58,6 +58,7 @@ class crm_case_section(osv.osv):
         'name': fields.char('Case Section',size=64, required=True, translate=True),
         'code': fields.char('Section Code',size=8),
         'active': fields.boolean('Active'),
+        'allow_unlink': fields.boolean('Allow Delete', help="Allows to delete non draft cases"),
         'sequence': fields.integer('Sequence'),
         'user_id': fields.many2one('res.users', 'Responsible User'),
         'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by Open ERP about cases in this section"),
@@ -66,6 +67,7 @@ class crm_case_section(osv.osv):
     }
     _defaults = {
         'active': lambda *a: 1,
+        'allow_unlink': lambda *a: 1,
     }
     _sql_constraints = [
         ('code_uniq', 'unique (code)', 'The code of the section must be unique !')
@@ -327,7 +329,7 @@ class crm_case(osv.osv):
 
     _columns = {
         'id': fields.integer('ID', readonly=True),
-        'name': fields.char('Description',size=64, required=True),
+        'name': fields.char('Description',size=64,required=True),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'active': fields.boolean('Active'),
         'description': fields.text('Your action'),
@@ -394,7 +396,7 @@ class crm_case(osv.osv):
 
     def unlink(self, cr, uid, ids, context={}):
         for case in self.browse(cr, uid, ids, context):
-            if case.state <> 'draft':
+            if (not case.section_id.allow_unlink) and (case.state <> 'draft'):
                 raise osv.except_osv(_('Warning !'),
                     _('You can not delete this case. You should better cancel it.'))
         return super(crm_case, self).unlink(cr, uid, ids, context)
@@ -437,9 +439,9 @@ class crm_case(osv.osv):
                         else:
                             base = mx.DateTime.strptime(case.create_date[:19], '%Y-%m-%d %H:%M:%S')
                     elif action.trg_date_type=='deadline' and case.date_deadline:
-                        base = mx.DateTime.strptime(case.date_deadline, '%Y-%m-%d')
+                        base = mx.DateTime.strptime(case.date_deadline, '%Y-%m-%d %H:%M:%S')
                     elif action.trg_date_type=='date' and case.date:
-                        base = mx.DateTime.strptime(case.date, '%Y-%m-%d')
+                        base = mx.DateTime.strptime(case.date, '%Y-%m-%d %H:%M:%S')
                     if base:
                         fnct = {
                             'minutes': lambda interval: mx.DateTime.RelativeDateTime(minutes=interval),
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 103682624b9..327f861c314 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -35,6 +35,7 @@
                             <field name="active" select="2"/>
                             <field name="user_id" select="2"/>
                             <field name="parent_id" select="2"/>
+                            <field name="allow_unlink" select="2"/>
                             <field name="reply_to" select="2"/>
                             <label colspan="2" string="Complete this if you use the mail gateway."/>
                         </page>
diff --git a/addons/crm_configuration/crm_claims_view.xml b/addons/crm_configuration/crm_claims_view.xml
index c457b6c0b80..6048d412cfb 100644
--- a/addons/crm_configuration/crm_claims_view.xml
+++ b/addons/crm_configuration/crm_claims_view.xml
@@ -29,10 +29,11 @@
         <field name="arch" type="xml">
             <form string="Claims">
                 <group colspan="4" col="6">
+                    <field name="name"/>
                     <field name="partner_id"/>
                     <field name="user_id" string="Responsible" select="2"/>
-                    <field name="section_id"/>
                     <newline/>
+                    <field name="section_id"/>
                     <field name="date" string="Date of Claim"/>
                     <field name="categ_id" string="Type of claim" select="1" on_change="onchange_categ_id(categ_id)"/>
                         <label string="Stage: " align="1.0"/>
diff --git a/addons/document/document.py b/addons/document/document.py
index 36d71c27a82..e86d90e4643 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -41,7 +41,7 @@ import tools
 
 def random_name():
     random.seed()
-    d = [random.choice(string.letters) for x in xrange(10) ]
+    d = [random.choice(string.ascii_letters) for x in xrange(10) ]
     name = "".join(d)
     return name
 
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index c8b43897c6c..424819a062f 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -39,11 +39,8 @@ class hr_employee(osv.osv):
     _inherit = "hr.employee"
     _columns = {
         'manager' : fields.boolean('Manager'),
-        'soc_security' : fields.char('Social security number', size=50, select=True),
         'medic_exam' : fields.date('Medical examination date'),
         'audiens_num' : fields.char('AUDIENS Number', size=30),
-        'nationality' : fields.many2one('res.country', 'Nationality'),
-        'birth_date' : fields.date('Birth Date'),
         'place_of_birth' : fields.char('Place of Birth', size=30),
         'marital_status' : fields.many2one('hr.employee.marital.status', 'Marital Status'),
         'children' : fields.integer('Number of children'),
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index 01a9f8e20ed..1b512f52fcf 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -109,11 +109,8 @@
                     </page>
                     <page string="Miscelleanous">
                         <field name="manager" select="1"/>
-                        <field name="soc_security" select="1"/>
                         <field name="medic_exam" select="1"/>
                         <field name="audiens_num"/>
-                        <field name="nationality"/>
-                        <field name="birth_date"/>
                         <field name="place_of_birth"/>
                         <field name="marital_status"/>
                         <field name="children"/>
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index e7129cf00d5..1e6e18f518e 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -65,7 +65,7 @@ class hr_expense_expense(osv.osv):
         'date_valid': fields.date('Date Valided'),
         'user_valid': fields.many2one('res.users', 'Validation User'),
         'account_move_id': fields.many2one('account.move', 'Account Move'),
-        'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines'),
+        'line_ids': fields.one2many('hr.expense.line', 'expense_id', 'Expense Lines', readonly=True, states={'draft':[('readonly',False)]} ),
         'note': fields.text('Note'),
         'amount': fields.function(_amount, method=True, string='Total Amount'),
         'invoice_id': fields.many2one('account.invoice', 'Invoice'),
@@ -125,6 +125,9 @@ class hr_expense_expense(osv.osv):
                     tax_id = [x.id for x in l.product_id.supplier_taxes_id]
                 else:
                     acc = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category')
+                    if not acc:
+                        raise osv.except_osv(_('Error !'), _('Please configure Default Expanse account for Product purchase, `property_account_expense_categ`'))
+                    
                 lines.append((0, False, {
                     'name': l.name,
                     'account_id': acc,
@@ -186,10 +189,10 @@ class hr_expense_line(osv.osv):
         'date_value': fields.date('Date', required=True),
         'expense_id': fields.many2one('hr.expense.expense', 'Expense', ondelete='cascade', select=True),
         'total_amount': fields.function(_amount, method=True, string='Total'),
-        'unit_amount': fields.float('Unit Price', readonly=True, states={'draft':[('readonly',False)]}),
-        'unit_quantity': fields.float('Quantities', readonly=True, states={'draft':[('readonly',False)]}),
-        'product_id': fields.many2one('product.product', 'Product', readonly=True, states={'draft':[('readonly',False)]}),
-        'uom_id': fields.many2one('product.uom', 'UoM', readonly=True, states={'draft':[('readonly',False)]}),
+        'unit_amount': fields.float('Unit Price'),
+        'unit_quantity': fields.float('Quantities' ),
+        'product_id': fields.many2one('product.product', 'Product' ),
+        'uom_id': fields.many2one('product.uom', 'UoM' ),
         'description': fields.text('Description'),
         'analytic_account': fields.many2one('account.analytic.account','Analytic account'),
         'ref': fields.char('Reference', size=32),
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr.py
index 4e19e15f2ee..7e2b7592d18 100644
--- a/addons/hr_holidays/hr.py
+++ b/addons/hr_holidays/hr.py
@@ -68,7 +68,7 @@ class hr_holidays(osv.osv):
 
     _columns = {
         'name' : fields.char('Description', required=True, readonly=True, size=64, states={'draft':[('readonly',False)]}),
-        'state': fields.selection([('draft', 'draft'), ('confirm', 'Confirmed'), ('refuse', 'Refused'), ('validate', 'Validate'), ('cancel', 'Cancel')], 'Status', readonly=True),
+        'state': fields.selection([('draft', 'draft'), ('confirm', 'Waiting Validation'), ('refuse', 'Refused'), ('validated', 'Validate'), ('cancel', 'Cancel')], 'Status', readonly=True),
         'date_from' : fields.datetime('Vacation start day', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         'date_to' : fields.datetime('Vacation end day',required=True,readonly=True, states={'draft':[('readonly',False)]}),
         'holiday_status' : fields.many2one("hr.holidays.status", "Holiday's Status", required=True,readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_view.xml
index cc940075097..7bb00565d26 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_view.xml
@@ -228,14 +228,14 @@
         <menuitem name="My Draft Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_draft" action="action_my_holiday_draft" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_waiting">
-            <field name="name">My Holidays Request Waiting confirmation</field>
+            <field name="name">My Awaiting Confirmation Holidays Requests</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('user_id','=',uid), ('state','=','confirm')]</field>
         </record>
-        <menuitem name="My Awaiting Confirmation Holidays Requests" parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" />
+        <menuitem parent="menu_action_my_holiday" id="menu_action_my_holiday_waiting" action="action_my_holiday_waiting" />
 
         <record model="ir.actions.act_window" id="action_my_holiday_validate">
             <field name="name">My Holidays Request Validated</field>
diff --git a/addons/hr_timesheet/hr_timesheet_report.xml b/addons/hr_timesheet/hr_timesheet_report.xml
index eae167002a4..06dcd5d6d55 100644
--- a/addons/hr_timesheet/hr_timesheet_report.xml
+++ b/addons/hr_timesheet/hr_timesheet_report.xml
@@ -4,15 +4,15 @@
 		<menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="40"/>
         <report auto="False" id="report_user_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet" xsl="hr_timesheet/report/user_timesheet.xsl"/>
         
-        <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee timesheet"/>
+        <wizard id="wizard_hr_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet" string="Employee Timesheet"/>
         <menuitem id="next_id_48" name="Timesheet" parent="hr.menu_hr_reporting"/><menuitem action="wizard_hr_timesheet" id="menu_wizard_hr_timesheet" parent="next_id_48" type="wizard"/>
         
-        <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print my timesheet"/>
+        <wizard id="wizard_hr_timesheet_my" menu="False" model="hr.employee" name="hr.analytical.timesheet.my" string="Print My Timesheet"/>
         <menuitem action="wizard_hr_timesheet_my" id="menu_wizard_hr_timesheet_my" parent="hr_timesheet.next_id_48" type="wizard"/>
         
-        <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
+        <report auto="False" id="report_users_timesheet" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet" xsl="hr_timesheet/report/users_timesheet.xsl"/>
         
-        <wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees timesheet"/>
+        <wizard id="wizard_hr_timesheet_users" menu="False" model="hr.employee" name="hr.analytical.timesheet_users" string="Employees Timesheet"/>
         <menuitem action="wizard_hr_timesheet_users" id="menu_wizard_hr_timesheet_users" parent="hr_timesheet.next_id_48" type="wizard"/>
         
     </data>
diff --git a/addons/hr_timesheet/security/ir.model.access.csv b/addons/hr_timesheet/security/ir.model.access.csv
index a718d2bd4ae..ca5bf104fe8 100644
--- a/addons/hr_timesheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet/security/ir.model.access.csv
@@ -1,2 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
 "access_hr_analytic_timesheet","hr.analytic.timesheet","model_hr_analytic_timesheet","hr.group_hr_user",1,1,1,1
+"access_hr_account_analytic_line","account.account.analytic.line","account.model_account_analytic_line","hr.group_hr_user",1,1,1,0
+"access_account_analytic_journal","account.account.analytic.journal","account.model_account_analytic_journal","hr.group_hr_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
index 794c38abc06..5063362bb1b 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_report.xml
@@ -20,7 +20,7 @@
             menu="False"
             model="account.analytic.line"
             name="account.analytic.profit"
-            string="Timesheet profit"
+            string="Timesheet Profit"
             groups="account.group_account_manager"/>
 
         <menuitem action="account_analytic_profit" id="print_account_analytic_profit" parent="hr.menu_hr_reporting" type="wizard"/>
diff --git a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
index ecf318d234f..9d1ac817baf 100644
--- a/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
+++ b/addons/hr_timesheet_invoice/wizard/account_analytic_profit.py
@@ -22,6 +22,7 @@
 
 import wizard
 import datetime
+import pooler
 
 form='''<?xml version="1.0"?>
 <form string="Choose">
@@ -34,8 +35,26 @@ form='''<?xml version="1.0"?>
 class wizard_report(wizard.interface):
     def _date_from(*a):
         return datetime.datetime.today().strftime('%Y-%m-1')
+    
     def _date_to(*a):
         return datetime.datetime.today().strftime('%Y-%m-%d')
+    
+    def _check(self, cr, uid, data, context):
+        pool = pooler.get_pool(cr.dbname)
+        line_obj = pool.get('account.analytic.line')
+        product_obj = pool.get('product.product')
+        price_obj = pool.get('product.pricelist')
+        ids = line_obj.search(cr, uid, [
+                ('date', '>=', data['form']['date_from']),
+                ('date', '<=', data['form']['date_to']),
+                ('journal_id', 'in', data['form']['journal_ids'][0][2]),
+                ('user_id', 'in', data['form']['employee_ids'][0][2]),
+                ])
+        if not ids:
+            raise wizard.except_wizard(_('Data Insufficient!'), _('No Records Found for Report!'))
+        
+        return data['form']
+    
 
     fields={
         'date_from':{
@@ -70,7 +89,7 @@ class wizard_report(wizard.interface):
             'result':{'type':'form', 'arch':form, 'fields':fields, 'state':[('end', 'Cancel'), ('report', 'Print')]}
         },
         'report':{
-            'actions':[],
+            'actions':[_check],
             'result':{'type':'print', 'report':'account.analytic.profit', 'state':'end'}
         }
     }
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index a568f711874..5b19583070c 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -135,7 +135,7 @@ class invoice_create(wizard.interface):
                            "   AND id IN (%s)"
                            "   AND product_id=%%s"
                            "   AND to_invoice=%%s" % ','.join(['%s']*len(data['ids'])),
-                           (account.id, data['ids'], product_id, factor_id))
+                           tuple([account.id]+ data['ids']+[ product_id, factor_id]))
                 line_ids = cr.dictfetchall()
                 note = []
                 for line in line_ids:
diff --git a/addons/hr_timesheet_sheet/security/ir.model.access.csv b/addons/hr_timesheet_sheet/security/ir.model.access.csv
index 5b7cf40a379..2962ede66ee 100644
--- a/addons/hr_timesheet_sheet/security/ir.model.access.csv
+++ b/addons/hr_timesheet_sheet/security/ir.model.access.csv
@@ -2,3 +2,4 @@
 "access_hr_timesheet_sheet_sheet","hr_timesheet_sheet.sheet","model_hr_timesheet_sheet_sheet","hr.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_day","hr_timesheet_sheet.sheet.day","model_hr_timesheet_sheet_sheet_day","hr.group_hr_user",1,1,1,1
 "access_hr_timesheet_sheet_sheet_account","hr_timesheet_sheet.sheet.account","model_hr_timesheet_sheet_sheet_account","hr.group_hr_user",1,1,1,1
+"access_hr_timesheet_invoice_factor","hr_timesheet_invoice.hr_timesheet_invoice.factor","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","hr.group_hr_user",1,0,0,0
\ No newline at end of file
diff --git a/addons/membership/membership.py b/addons/membership/membership.py
index 86b09aa4f55..a0d45169278 100644
--- a/addons/membership/membership.py
+++ b/addons/membership/membership.py
@@ -44,8 +44,6 @@ STATE_PRIOR = {
         'paid' : 7
         }
 
-
-
 #~ REQUETE = '''SELECT partner, state FROM (
 #~ SELECT members.partner AS partner,
 #~ CASE WHEN MAX(members.state) = 0 THEN 'none'
@@ -136,7 +134,6 @@ STATE_PRIOR = {
 #~ %s
 #~ '''
 
-
 class membership_line(osv.osv):
     '''Member line'''
 
@@ -757,5 +754,6 @@ class account_invoice_line(osv.osv):
                 'account_invoice_line': line.id,
                 })
         return result
+
 account_invoice_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/membership/membership_demo.xml b/addons/membership/membership_demo.xml
index 1196864974a..dba3e44abc3 100644
--- a/addons/membership/membership_demo.xml
+++ b/addons/membership/membership_demo.xml
@@ -24,6 +24,16 @@
 
 
 <!-- Demo data for Accounts -->
+	<record id="account_account_membershipparent" model="account.account">
+		<field name="name">membership</field>
+		<field name="code">0</field>
+		<field name="company_id" ref="base.main_company"/>
+		<!--<field eval="1" name="sign"/>-->
+		<field eval="1" name="active"/>
+		<field name="type">view</field>
+		<field eval="0" name="reconcile"/>
+		<field name="user_type" ref="account.account_type_root"/>
+	</record>
 	<record id="account_account_membershipaccount0" model="account.account">
 		<field name="name">membership account</field>
 		<field name="code">1254</field>
@@ -33,6 +43,7 @@
 		<field name="type">other</field>
 		<field eval="1" name="reconcile"/>
 		<field name="user_type" ref="account.account_type_expense"/>
+		<field name="parent_id" ref="account_account_membershipparent"/>
 	</record>
 
 <!-- Demo data for Invoices -->
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 2dd381c65eb..d30276dae95 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -186,6 +186,20 @@
 
 
         <!-- MEMBERSHIP/MEMBERS/ASSOCIATED MEMBERS  -->
+        <record model="ir.ui.view" id="membership_members_associated_tree">
+            <field name="name">associate members</field>
+            <field name="model">res.partner</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Members">
+                    <field name="name"/>
+                    <field name="membership_start"/>
+                    <field name="membership_stop"/>
+                    <field name="membership_state"/>
+                    <field name="associate_member"/>
+                </tree>
+            </field>
+        </record>
 
         <record model="ir.actions.act_window" id="action_membership_members_associated">
             <field name="name">Associated members</field>
@@ -196,7 +210,7 @@
         <record model="ir.actions.act_window.view" id="action_membership_members_associated_view_tree">
             <field name="sequence" eval="1"/>
             <field name="view_mode">tree</field>
-            <field name="view_id" ref="membership_members_tree"/>
+            <field name="view_id" ref="membership_members_associated_tree"/>
             <field name="act_window_id" ref="action_membership_members_associated"/>
         </record>
 
diff --git a/addons/membership/wizard/invoice_membership.py b/addons/membership/wizard/invoice_membership.py
index ce048e41611..30d8bc6e6bf 100644
--- a/addons/membership/wizard/invoice_membership.py
+++ b/addons/membership/wizard/invoice_membership.py
@@ -61,7 +61,6 @@ def _invoice_membership(self, cr, uid, data, context):
         line_value =  {
             'product_id' : product_id,
             }
-
         quantity = 1
         line_dict = invoice_line_obj.product_id_change(cr, uid, {}, product_id, product['uom_id'][0], quantity, '', 'out_invoice', partner_id, fpos_id, context=context)
         line_value.update(line_dict['value'])
diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py
index cb9e1500f52..f6d4a685387 100644
--- a/addons/mrp/mrp.py
+++ b/addons/mrp/mrp.py
@@ -399,8 +399,8 @@ class mrp_production(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', required=True, domain=[('type','<>','service')]),
         'product_qty': fields.float('Product Qty', required=True),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
-        'product_uos_qty': fields.float('Product Qty'),
-        'product_uos': fields.many2one('product.uom', 'Product UOM'),
+        'product_uos_qty': fields.float('Product UoS Qty'),
+        'product_uos': fields.many2one('product.uom', 'Product UoS'),
 
         'location_src_id': fields.many2one('stock.location', 'Raw Materials Location', required=True,
             help="Location where the system will look for products used in raw materials."),
@@ -1082,17 +1082,21 @@ class mrp_procurement(osv.osv):
 
     def action_cancel(self, cr, uid, ids):
         todo = []
+        todo2 = []
         for proc in self.browse(cr, uid, ids):
             if proc.move_id and proc.move_id.state=='waiting':
-                todo.append(proc.move_id.id)
+                if proc.close_move:
+                    todo2.append(proc.move_id.id)
+                else:
+                    todo.append(proc.move_id.id)
+        if len(todo2):
+            self.pool.get('stock.move').action_cancel(cr, uid, todo2)
         if len(todo):
             self.pool.get('stock.move').write(cr, uid, todo, {'state':'assigned'})
         self.write(cr, uid, ids, {'state':'cancel'})
-
         wf_service = netsvc.LocalService("workflow")
         for id in ids:
             wf_service.trg_trigger(uid, 'mrp.procurement', id, cr)
-
         return True
 
     def action_check_finnished(self, cr, uid, ids):
@@ -1173,6 +1177,13 @@ class stock_warehouse_orderpoint(osv.osv):
             v = {'product_uom':prod.uom_id.id}
             return {'value': v}
         return {}
+    def copy(self, cr, uid, id, default=None,context={}):
+        if not default:
+            default = {}
+        default.update({
+            'name': self.pool.get('ir.sequence').get(cr, uid, 'mrp.warehouse.orderpoint') or '',
+        })
+        return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context)
 stock_warehouse_orderpoint()
 
 
diff --git a/addons/mrp/mrp_report.xml b/addons/mrp/mrp_report.xml
index eb97477f687..ee552abad59 100644
--- a/addons/mrp/mrp_report.xml
+++ b/addons/mrp/mrp_report.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
         <report auto="True" header="False" id="report_bom_structure" model="mrp.bom" name="bom.structure" rml="mrp/report/bom_structure.rml" string="BOM Structure"/>
-        
+
         <report
 			id="report_mrp_production_report"
 			string="Production Order"
@@ -12,6 +12,6 @@
 			rml="mrp/report/order.rml"
 			auto="False"
 			/>
-			
+
     </data>
 </openerp>
diff --git a/addons/mrp/report/bom_structure.rml b/addons/mrp/report/bom_structure.rml
index 349e9379ad3..7601e490eec 100644
--- a/addons/mrp/report/bom_structure.rml
+++ b/addons/mrp/report/bom_structure.rml
@@ -1,3 +1,138 @@
 <?xml version="1.0"?>
-<document filename="test.pdf"><template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="57.0" y1="57.0" width="498" height="678"/></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"/><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"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" alignment="LEFT"/><paraStyle name="P2" fontName="Times-Roman" fontSize="16.0" leading="20" alignment="CENTER"/><paraStyle name="P3" fontName="Times-Roman" alignment="LEFT"/><paraStyle name="P4" fontName="Times-Roman" fontSize="13.0" leading="16" alignment="LEFT"/><paraStyle name="P5" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/><paraStyle name="P6" fontName="Times-Roman" fontSize="12.0" leading="15" alignment="LEFT"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><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="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/><paraStyle name="Table Contents" fontName="Times-Roman"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/></stylesheet><images/><story><para style="P2">BOM Structure</para><para style="P1"><font color="white"> </font></para><section><para style="P5"><font face="Times-Roman">[[ repeatIn(objects, 'o') ]]</font></para><blockTable colWidths="157.0,151.0,85.0,50.0,56.0" style="Table1"><tr><td><para style="P3">BOM</para></td><td><para style="P3">Product Name</para></td><td><para style="P3">Quantity</para></td><td><para style="P3">UoM</para></td><td><para style="P3">Code</para></td></tr><tr><td><para style="P6"><font face="Times-Roman">[[ o.name ]]</font></para></td><td><para style="P3">[[ o.product_id.name ]]</para></td><td><para style="P3">[[ o.product_qty ]]</para></td><td><para style="P3">[[ o.product_uom.name ]]</para></td><td><para style="P3">[[ o.code ]]</para></td></tr><tr><td><para style="P3">[[ repeatIn(o.bom_lines, 'l') ]]</para><para style="P3">- [[ l.name ]]</para></td><td><para style="P3">[[ l.product_id.name ]]</para></td><td><para style="P3">[[ l.product_qty ]]</para></td><td><para style="P3">[[ l.product_uom.name ]]</para></td><td><para style="P3">[[ l.code ]]</para></td></tr></blockTable><para style="P1"><font color="white"> </font></para></section></story></document>
-
+<document filename="test.pdf">
+  <template pageSize="(612.0,792.0)" title="Test" author="Martin Simon" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="57.0" y1="57.0" width="498" height="678"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <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"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <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="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Times-Roman"/>
+    <paraStyle name="Table Contents" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="Table Heading" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER"/>
+    <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="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" 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="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Footer" fontName="Times-Roman"/>
+    <paraStyle name="Horizontal Line" fontName="Times-Roman" 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="9.0" leading="11" 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="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.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="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_remove_space" fontName="Times-Roman" fontSize="2.0" leading="3" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <images/>
+  <story>
+    <para style="terp_header_Centre">BOM Structure</para>
+    <section>
+      <para style="terp_default_9">[[ repeatIn(objects, 'o') ]]</para>
+      <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table3">
+        <tr>
+          <td>
+            <para style="terp_tblheader_General">BOM</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General">Product Name</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Right">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_General_Centre">Code</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table4">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ o.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ o.product_id.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ o.product_qty ]] [[ o.product_uom.name ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9">[[ o.code ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <section>
+        <para style="terp_default_9">[[ repeatIn(o.bom_lines, 'l') ]]</para>
+        <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table1">
+          <tr>
+            <td>
+              <para style="P1">- [[ l.name ]]</para>
+            </td>
+            <td>
+              <para style="P1">[[ l.product_id.name ]]</para>
+            </td>
+            <td>
+              <para style="P2">[[ l.product_qty ]] [[ l.product_uom.name ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_Centre_9">[[ l.code ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+        <para style="terp_remove_space">
+          <font color="white"> </font>
+        </para>
+      </section>
+    </section>
+  </story>
+</document>
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 07708b1cd04..eb993ecf825 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -95,6 +95,8 @@ class product_pricelist(osv.osv):
     
     def name_get(self, cr, uid, ids, context={}):
         result= []
+        if not all(ids):
+            return result
         for pl in self.browse(cr, uid, ids, context):
             name = pl.name + ' ('+ pl.currency_id.name + ')'
             result.append((pl.id,name))
diff --git a/addons/product/report/product_price.xsl b/addons/product/report/product_price.xsl
index 5442092fdcf..fb0f7f44b3a 100644
--- a/addons/product/report/product_price.xsl
+++ b/addons/product/report/product_price.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet version="1.0"
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format">
-   <xsl:import href="../../custom/corporate_defaults.xsl" />
+   <xsl:import href="../../base/report/corporate_defaults.xsl" />
     <xsl:template match="/">
 		<xsl:call-template name="rml" />
     </xsl:template>
diff --git a/addons/project/project.py b/addons/project/project.py
index fc0fca5d04d..ecbb98635ba 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -31,6 +31,13 @@ class project(osv.osv):
     _name = "project.project"
     _description = "Project"
 
+    def _complete_name(self, cr, uid, ids, name, args, context):
+        res = {}
+        for m in self.browse(cr, uid, ids, context=context):
+            res[m.id] = (m.parent_id and (m.parent_id.name + '/') or '') + m.name
+        return res
+
+
     def check_recursion(self, cursor, user, ids, parent=None):
         return super(project, self).check_recursion(cursor, user, ids,
                 parent=parent)
@@ -81,6 +88,7 @@ class project(osv.osv):
         return super(project, self).unlink(cr, uid, ids, *args, **kwargs)
     _columns = {
         'name': fields.char("Project Name", size=128, required=True),
+        'complete_name': fields.function(_complete_name, method=True, string="Project Name", type='char', size=128),
         'active': fields.boolean('Active'),
         'category_id': fields.many2one('account.analytic.account','Analytic Account', help="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."),
         'priority': fields.integer('Sequence'),
@@ -115,7 +123,7 @@ class project(osv.osv):
         'state': lambda *a: 'open'
     }
 
-    _order = "priority"
+    _order = "parent_id,priority,name"
     _constraints = [
         (check_recursion, 'Error ! You can not create recursive projects.', ['parent_id'])
     ]
@@ -236,7 +244,7 @@ class task(osv.osv):
             res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
         return res
 
-    def onchange_planned(self, cr, uid, ids, planned, effective):
+    def onchange_planned(self, cr, uid, ids, planned, effective=0.0):
         return {'value':{'remaining_hours': planned-effective}}
 
     def _default_project(self, cr, uid, context={}):
@@ -271,7 +279,7 @@ class task(osv.osv):
         'history': fields.function(_history_get, method=True, string="Task Details", type="text"),
         'notes': fields.text('Notes'),
 
-        'planned_hours': fields.float('Planned Hours', readonly=True, states={'draft':[('readonly',False)]}, required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
+        'planned_hours': fields.float('Planned Hours', required=True, help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
         'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', store=True, help="Computed using the sum of the task work done."),
         'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
         'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', store=True, help="Computed as: Time Spent + Remaining Time."),
@@ -280,7 +288,7 @@ class task(osv.osv):
 
         'user_id': fields.many2one('res.users', 'Assigned to'),
         'partner_id': fields.many2one('res.partner', 'Partner'),
-        'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done', readonly=False, states={'draft':[('readonly',True)]}),
+        'work_ids': fields.one2many('project.task.work', 'task_id', 'Work done'),
     }
     _defaults = {
         'user_id': lambda obj,cr,uid,context: uid,
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0c216b99407..6244c2ceca4 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -33,7 +33,7 @@
                             <separator colspan="4" string="Project's members"/>
                             <field colspan="4" name="members" nolabel="1"/>
                             <group col="9" colspan="8">
-                                <field name="state"/>
+                                <field name="state" select="1"/>
                                 <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
                                 <button name="set_open" string="Reactivate Project" type="object" states="pending,cancelled,done" icon="gtk-ok"/>
                                 <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
@@ -73,6 +73,22 @@
                 </form>
             </field>
         </record>
+        <record id="view_project_list" model="ir.ui.view">
+            <field name="name">project.project.list</field>
+            <field name="model">project.project</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="5"/>
+            <field name="arch" type="xml">
+                <tree string="Projects">
+                    <field name="complete_name"/>
+                    <field name="manager"/>
+                    <field name="partner_id"/>
+                    <field name="effective_hours" widget="float_time"/>
+                    <field name="total_hours" widget="float_time"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
         <record id="view_project" model="ir.ui.view">
             <field name="name">project.project.tree</field>
             <field name="model">project.project</field>
@@ -243,11 +259,11 @@
             <field name="arch" type="xml">
                 <form string="Task edition">
                     <group colspan="6" col="6">
-                        <field name="name" select="1"/>
-                        <field name="project_id" required="1" select="1"/>
-                        <field name="total_hours" widget="float_time"/>
-                        <field name="user_id" select="1"/>
-                        <field name="date_deadline" select="2"/>
+                        <field name="name" select="1" attrs="{'readonly':[('state','=','done')]}" />
+                        <field name="project_id" required="1" select="1" attrs="{'readonly':[('state','=','done')]}" />
+                        <field name="total_hours" widget="float_time" attrs="{'readonly':[('state','=','done')]}" />
+                        <field name="user_id" select="1" attrs="{'readonly':[('state','=','done')]}" />
+                        <field name="date_deadline" select="2" attrs="{'readonly':[('state','=','done')]}" />
                         <field name="progress" widget="progressbar"/>
                     </group>
                     <notebook colspan="4">
@@ -256,6 +272,7 @@
                             <field
                                 name="planned_hours" 
                                 widget="float_time"
+                                attrs="{'readonly':[('state','!=','draft')]}" 
                                 on_change="onchange_planned(planned_hours,effective_hours)"/>
                                 <field name="remaining_hours" select="2" widget="float_time" attrs="{'readonly':[('state','!=','draft')]}" colspan="2"/>
                                 <button name="%(action_config_compute_remaining)d" string="Review" type="action" colspan="1" target="new" states="open,pending"/>
@@ -265,8 +282,15 @@
                             <field name="effective_hours" widget="float_time"/>
                             </group>
 
-                            <field colspan="4" name="description" nolabel="1" select="2"/>
-                            <field colspan="4" name="work_ids" nolabel="1"/>
+                            <field colspan="4" name="description" nolabel="1" select="2"  attrs="{'readonly':[('state','=','done')]}" />
+                            <field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['draft','done'])]}">
+                                <tree string="Task Work" editable="top">
+                                    <field name="date" />
+                                    <field name="user_id" />
+                                    <field name="hours" widget="float_time" />
+                                    <field name="name" />
+                                </tree>
+                            </field>
                             <newline/>
                             <group col="11" colspan="4">
                                 <field name="state" select="1"/>
@@ -282,7 +306,7 @@
                         </page>
                         <page groups="base.group_extended" string="Delegations">
                             <field colspan="4" name="history" nolabel="1"/>
-                            <field colspan="4" height="150" name="child_ids" nolabel="1">
+                            <field colspan="4" height="150" name="child_ids" nolabel="1" attrs="{'readonly':[('state','!=','draft')]}">
                                 <tree string="Delegated tasks">
                                     <field name="name"/>
                                     <field name="user_id"/>
@@ -294,7 +318,7 @@
                             </field>
                             <field colspan="4" name="parent_id"/>
                         </page>
-                        <page groups="base.group_extended" string="Extra Info">
+                        <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','in',['draft','done'])]}">
                             <separator string="Planning" colspan="2"/>
                             <separator string="Dates" colspan="2"/>
                             <field name="priority"/>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 2831aaf07c8..ebd9444c47c 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -30,15 +30,9 @@
             <field name="name">Contexts</field>
             <field name="res_model">project.gtd.context</field>
         </record>
-        <record model="ir.actions.act_window" id="open_gtd_context_tree_my">
-            <field name="name">My Contexts</field>
-            <field name="res_model">project.gtd.context</field>
-            <field name="domain">[('user_id','=',uid)]</field>
-        </record>
-        
+
         <menuitem name="Time Management" id="menu_open_gtd_time" parent="project.menu_definitions"/>
         <menuitem name="Contexts" id="menu_open_gtd_time_contexts" parent="menu_open_gtd_time" action="open_gtd_context_tree"/>        
-        <menuitem name="My Contexts" id="menu_open_gtd_time_my_contexts" parent="menu_open_gtd_time_contexts" action="open_gtd_context_tree_my"/>    
 
         <record model="ir.ui.view" id="view_gtd_timebox_tree">
             <field name="name">project.gtd.timebox.tree</field>
@@ -112,7 +106,10 @@
                     <field name="date_start"/>
                     <field name="priority"/>
                     <field name="date_deadline"/>
-                    <field name="planned_hours"  widget="float_time" sum="Est. Hours"/>
+                    <field name="planned_hours"  widget="float_time" sum="Planned"
+                                on_change="onchange_planned(planned_hours,effective_hours)"/>
+                    <field name="remaining_hours" invisible="1"/>
+                    <field name="effective_hours" invisible="1"/>
                     <field name="state"/>
                 </tree>
             </field>
@@ -145,12 +142,16 @@
             <field name="name">My Timeboxes</field>
             <field name="res_model">project.gtd.timebox</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="view_type">form</field>
+            <field name="view_type">tree</field>
             <field name="view_id" ref="view_gtd_timebox_treelist"/>
             <field name="context">{'record_id':False}</field>
         </record>
         
-        <menuitem name="All My Timeboxes" id="menu_open_time_allinbox" parent="menu_open_time" action="open_gtd_timebox_all"/>
+        <menuitem
+            name="All My Timeboxes" 
+            id="menu_open_time_allinbox" 
+            parent="menu_open_time" 
+            action="open_gtd_timebox_all"/>
 
     <record model="ir.ui.view" id="project_task">
         <field name="name">project.task.form.timebox</field>
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 8ba37697c8f..b2d0d173fa9 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -476,7 +476,7 @@ class purchase_order_line(osv.osv):
                     'date': date_order,
                     })[pricelist]
 
-        qty = 1
+        qty = qty or 1.0
         seller_delay = 0
         for s in prod.seller_ids:
             seller_delay = s.delay
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index d0ee536e63c..161f7117090 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -173,7 +173,7 @@
                     <notebook>
                         <page string="Order Line">
                             <field colspan="4" context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)"/>
-                            <field name="product_qty"/>
+                            <field context="partner_id=parent.partner_id,quantity=product_qty,pricelist=parent.pricelist_id,uom=product_uom,warehouse=parent.warehouse_id" name="product_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order, parent.fiscal_position)"/>
                             <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_qty,product_uom,parent.partner_id, parent.date_order)"/>
                             <field colspan="4" name="name"/>
                             <field name="date_planned"/>
diff --git a/addons/report_account/report_receivable.py b/addons/report_account/report_receivable.py
index 5d7a12df86b..ce17b84f2e4 100644
--- a/addons/report_account/report_receivable.py
+++ b/addons/report_account/report_receivable.py
@@ -20,8 +20,14 @@
 #
 ##############################################################################
 
+import time
+import datetime
+import mx.DateTime
+
+import pooler
 from osv import fields,osv
 
+
 def _code_get(self, cr, uid, context={}):
     acc_type_obj = self.pool.get('account.account.type')
     ids = acc_type_obj.search(cr, uid, [])
@@ -41,6 +47,7 @@ class report_account_receivable(osv.osv):
         'credit':fields.float('Credit', readonly=True),
     }
     _order = 'name desc'
+    
     def init(self, cr):
         cr.execute("""
             create or replace view report_account_receivable as (
@@ -63,7 +70,86 @@ class report_account_receivable(osv.osv):
 report_account_receivable()
 
                     #a.type in ('receivable','payable')
+class temp_range(osv.osv):
+    _name = 'temp.range'
+    _description = 'A Temporary table used for Dashboard view'
+    
+    _columns = {
+        'name' : fields.char('Range',size=64)
+    }
+    
+temp_range()    
+    
+class report_aged_receivable(osv.osv):
+    _name = "report.aged.receivable"
+    _description = "Aged Receivable Till Today"
+    _auto = False
+    
+    def __init__(self, pool, cr):
+        super(report_aged_receivable, self).__init__(pool, cr)
+        self.called = False
+        
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+        """ To call the init() method timely
+        """
+        if not self.called:
+            self.init(cr, user)
+        self.called = True # To make sure that init doesn't get called multiple times
+        
+        res = super(report_aged_receivable, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+        return res
+    
+    def _calc_bal(self, cr, uid, ids, name, args, context):
+        res = {}
+        for period in self.read(cr,uid,ids,['name']):
+           date1,date2 = period['name'].split(' to ')
+           query = "SELECT SUM(credit-debit) FROM account_move_line AS line, account_account as ac  \
+                        WHERE (line.account_id=ac.id) AND ac.type='receivable' \
+                            AND (COALESCE(line.date,date) BETWEEN '%s' AND  '%s') \
+                            AND (reconcile_id IS NULL) AND ac.active"%(str(date2),str(date1))
+           cr.execute(query)
+           amount = cr.fetchone()
+           amount = amount[0] or 0.00
+           res[period['id']] = amount
+           
+        return res
+    
+    _columns = {
+        'name': fields.char('Month Range', size=7, readonly=True),
+        'balance': fields.function(_calc_bal, method=True, string='Balance', readonly=True),
+    }
+    
+    def init(self, cr, uid=1):
+        """ This view will be used in dashboard
+        """
+#        ranges = _get_ranges(cr) # Gets the ranges for the x axis of the graph (name column values)
+        pool_obj_fy = pooler.get_pool(cr.dbname).get('account.fiscalyear')
+        today = mx.DateTime.strptime(time.strftime('%Y-%m-%d'), '%Y-%m-%d') - mx.DateTime.RelativeDateTime(days=1)
+        today = today.strftime('%Y-%m-%d')
+        fy_id  = pool_obj_fy.find(cr,uid)
+        LIST_RANGES = []
+        if fy_id:
+            fy_start_date = pool_obj_fy.read(cr, uid, fy_id, ['date_start'])['date_start']
+            fy_start_date = mx.DateTime.strptime(fy_start_date, '%Y-%m-%d')
+            last_month_date = mx.DateTime.strptime(today, '%Y-%m-%d') - mx.DateTime.RelativeDateTime(months=1)
 
+            while (last_month_date > fy_start_date):
+                LIST_RANGES.append(today + " to " + last_month_date.strftime('%Y-%m-%d'))
+                today = (last_month_date- 1).strftime('%Y-%m-%d')
+                last_month_date = mx.DateTime.strptime(today, '%Y-%m-%d') - mx.DateTime.RelativeDateTime(months=1)
+            
+            LIST_RANGES.append(today +" to " + fy_start_date.strftime('%Y-%m-%d'))
+            cr.execute('delete from temp_range')
+            
+            for range in LIST_RANGES:
+                pooler.get_pool(cr.dbname).get('temp.range').create(cr, uid, {'name':range})
+                
+        cr.execute("""
+            create or replace view report_aged_receivable as (
+                select id,name from temp_range
+            )""")
+    
+report_aged_receivable()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/report_account/report_receivable_view.xml b/addons/report_account/report_receivable_view.xml
index dd6c93f3492..74e1155fb1d 100644
--- a/addons/report_account/report_receivable_view.xml
+++ b/addons/report_account/report_receivable_view.xml
@@ -49,5 +49,37 @@
         </record>
         <menuitem action="action_account_receivable_graph" id="menu_account_receivable_graph" parent="account.menu_finance_reporting"/>
         
+        <!-- Report for Aged Receivable -->
+        
+        <record id="view_aged_recv_graph" model="ir.ui.view">
+            <field name="name">report.aged.receivable.graph</field>
+            <field name="model">report.aged.receivable</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Aged Receivable" type="bar">
+                    <field name="name"/>
+                    <field name="balance" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        
+        <record id="view_aged_recv_tree" model="ir.ui.view">
+            <field name="name">report.aged.receivable.tree</field>
+            <field name="model">report.aged.receivable</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Aged Receivable">
+                    <field name="name"/>
+                    <field name="balance"/>
+                </tree>
+            </field>
+        </record>
+        
+        <record id="action_aged_receivable_graph" model="ir.actions.act_window">
+            <field name="name">Aged Receivable</field>
+            <field name="res_model">report.aged.receivable</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+        </record>
     </data>
 </openerp>
diff --git a/addons/report_sale/report_sale_view.xml b/addons/report_sale/report_sale_view.xml
index eba8fe71223..1cfb0509ae1 100644
--- a/addons/report_sale/report_sale_view.xml
+++ b/addons/report_sale/report_sale_view.xml
@@ -149,9 +149,28 @@
             <field name="domain">[('date_order','&gt;=',time.strftime('%Y-%m-01')),('state','&lt;&gt;','draft'),('state','&lt;&gt;','cancel')]</field>
         </record>
         <menuitem action="action_order_sale_list" id="menu_report_order_sale_list" parent="report_sale.next_id_81"/>
+		
+		<record id="view_so_pipeline_graph" model="ir.ui.view">
+             <field name="name">sale.order.dashboard.graph</field>
+             <field name="model">sale.order</field>
+             <field name="type">graph</field>
+             <field name="arch" type="xml">
+                 <graph string="Sales by State" type="bar">
+                     <field name="state"/>
+                     <field name="amount_total"/>
+                 </graph>
+             </field>
+        </record>
         
-        
-        
-        
+        <record id="action_so_pipeline" model="ir.actions.act_window">
+            <field name="name">Sales by State</field>
+            <field name="res_model">sale.order</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_so_pipeline_graph"/>
+            <field name="domain">[('state','&lt;&gt;','done')]</field>
+        </record>
+		
+		        
     </data>
 </openerp>
diff --git a/addons/report_timesheet/report_timesheet.py b/addons/report_timesheet/report_timesheet.py
index b2ee26babbe..1c526d3f8d9 100644
--- a/addons/report_timesheet/report_timesheet.py
+++ b/addons/report_timesheet/report_timesheet.py
@@ -94,6 +94,7 @@ class report_timesheet_account_date(osv.osv):
         'quantity': fields.float('Quantity', readonly=True),
     }
     _order = 'name desc,account_id desc,user_id desc'
+    
     def init(self, cr):
         cr.execute("""
             create or replace view report_timesheet_account_date as (
@@ -152,5 +153,53 @@ class report_timesheet_invoice(osv.osv):
         """)
 report_timesheet_invoice()
 
+class report_random_timsheet(osv.osv):
+    _name = "report.random.timesheet"
+    _description = "Random Timesheet Report"
+    _auto = False
+    
+    _columns = {
+        'analytic_account_id' : fields.many2one('account.analytic.account','Analytic Account', readonly=True),
+        'name': fields.char('Description', size=64, readonly=True),
+        'quantity' : fields.float('Quantity', readonly=True),
+        'date': fields.date('Date', readonly=True),
+        'user_id' : fields.many2one('res.users', 'User', readonly=True)
+    }
+    _order = "date desc"
+    
+    def __init__(self, pool, cr):
+        super(report_random_timsheet, self).__init__(pool, cr)
+        self.called = False
+    
+    def fields_view_get(self, cr, user, view_id=None, view_type='form', context=None, toolbar=False):
+        """ To call the init() method timely
+        """
+        if not self.called:
+            self.init(cr, user)
+        self.called = True # To make sure that init doesn't get called multiple times
+        
+        res = super(report_random_timsheet, self).fields_view_get(cr, user, view_id, view_type, context, toolbar)
+        return res
+    
+    def init(self, cr, uid=1):
+        
+        cr.execute("""create or replace view report_random_timesheet as (
+
+            select 
+                line.id as id, line.account_id as analytic_account_id, line.name as name,
+                line.unit_amount as quantity, line.date as date, line.user_id as user_id
+            from 
+                account_analytic_line line, hr_department dept,hr_department_user_rel dept_user
+            where
+                (dept.id = dept_user.department_id AND dept_user.user_id=line.user_id AND line.user_id is not null)
+                AND (dept.manager_id = """ + str(uid) + """ ) 
+                AND (line.date < CURRENT_DATE AND line.date >= (CURRENT_DATE-3))
+            ORDER BY line.name LIMIT 10
+            )
+            """ )
+
+report_random_timsheet()
+
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/report_timesheet/report_timesheet_view.xml b/addons/report_timesheet/report_timesheet_view.xml
index 659be98b8f2..5bfe1edbb6b 100644
--- a/addons/report_timesheet/report_timesheet_view.xml
+++ b/addons/report_timesheet/report_timesheet_view.xml
@@ -278,5 +278,30 @@
         
         <act_window domain="[('manager_id', '=', active_id)]" id="act_res_users_2_report_timesheet_invoice" name="Costs to invoice" res_model="report_timesheet.invoice" src_model="res.users"/>
         
+        
+        <!-- Random Timesheet  -->
+        
+        <record model="ir.ui.view" id="view_random_timesheet_tree">
+            <field name="name">report.random.timesheet.tree</field>
+            <field name="model">report.random.timesheet</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Random Timesheets">
+                	<field name="analytic_account_id" select="1"/>
+                	<field name="name" select="1"/>
+                	<field name="quantity" select="2" />
+                	<field name="date" select="1"/>
+                </tree>
+            </field>
+    	</record>
+	
+		<record model="ir.actions.act_window" id="action_random_timesheet_board">
+            <field name="type">ir.actions.act_window</field>
+            <field name="name">Random Timesheet</field>
+            <field name="res_model">report.random.timesheet</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="view_id" ref="view_random_timesheet_tree"/>
+        </record>
     </data>
 </openerp>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 6e635b96be2..a0fe7710b2a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -310,7 +310,10 @@ class sale_order(osv.osv):
         pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False
         payment_term = part.property_payment_term and part.property_payment_term.id or False
         fiscal_position = part.property_account_position and part.property_account_position.id or False
-        return {'value':{'partner_invoice_id': addr['invoice'], 'partner_order_id':addr['contact'], 'partner_shipping_id':addr['delivery'], 'pricelist_id': pricelist, 'payment_term' : payment_term, 'fiscal_position': fiscal_position}}
+        val = {'partner_invoice_id': addr['invoice'], 'partner_order_id':addr['contact'], 'partner_shipping_id':addr['delivery'], 'payment_term' : payment_term, 'fiscal_position': fiscal_position}
+        if pricelist:
+            val['pricelist_id'] = pricelist
+        return {'value':val}
 
     def shipping_policy_change(self, cr, uid, ids, policy, context={}):
         if not policy:
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 3b49f0749f7..86711ba4029 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -11,8 +11,8 @@
                 <form position="inside">
                     <group col="2" colspan="2">
                         <separator string="Accounting Stock Properties" colspan="2"/>
-                        <field name="property_stock_account_input_categ"/>
-                        <field name="property_stock_account_output_categ"/>
+                        <field name="property_stock_account_input_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_account_output_categ" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                         <field name="property_stock_journal"/>
                     </group>
                 </form>
@@ -34,8 +34,8 @@
                         <field name="property_stock_production"/>
                         <field name="property_stock_inventory"/>
                         <separator string="Accounting Entries" colspan="4"/>
-                        <field name="property_stock_account_input"/>
-                        <field name="property_stock_account_output"/>
+                        <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                        <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                     </page>
                 </page>
             </field>
@@ -50,8 +50,8 @@
             <field name="priority">26</field>
             <field name="arch" type="xml">
                 <field name="property_account_expense" position="after">
-                    <field name="property_stock_account_output"/>
-                    <field name="property_stock_account_input"/>
+                    <field name="property_stock_account_output" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
+                    <field name="property_stock_account_input" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                 </field>
             </field>
         </record>
diff --git a/addons/stock/report/lot_overview.xsl b/addons/stock/report/lot_overview.xsl
index ec34194ff6c..0244bcaa609 100644
--- a/addons/stock/report/lot_overview.xsl
+++ b/addons/stock/report/lot_overview.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 	
 	<xsl:template name="first_page_frames">
diff --git a/addons/stock/report/lot_overview_all.xsl b/addons/stock/report/lot_overview_all.xsl
index 9bd2ec19577..c78b8f63bfa 100644
--- a/addons/stock/report/lot_overview_all.xsl
+++ b/addons/stock/report/lot_overview_all.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 	
 	<xsl:template name="first_page_frames">
diff --git a/addons/stock/report/stock_by_location.xsl b/addons/stock/report/stock_by_location.xsl
index cbbed9299c4..bb70b0b5643 100644
--- a/addons/stock/report/stock_by_location.xsl
+++ b/addons/stock/report/stock_by_location.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-	<xsl:import href="../../custom/corporate_defaults.xsl"/>
+	<xsl:import href="../../base/report/corporate_defaults.xsl"/>
 	<xsl:import href="../../base/report/rml_template.xsl"/>
 	<xsl:variable name="page_format">a4_normal</xsl:variable>
 
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index f94c274256c..25b721613a3 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -395,6 +395,10 @@ class stock_picking(osv.osv):
             res[pick]['max_date'] = dt2
         return res
 
+    def create(self, cr, user, vals, context=None):
+        if 'name' not in vals:
+            vals['name'] = self.pool.get('ir.sequence').get(cr, user, 'stock.picking')
+        return super(stock_picking, self).create(cr, user, vals, context)
 
     _columns = {
         'name': fields.char('Reference', size=64, select=True),
@@ -432,7 +436,7 @@ class stock_picking(osv.osv):
             select=True, required=True, readonly=True, states={'draft':[('readonly',False)]}),
     }
     _defaults = {
-        'name': lambda self,cr,uid,context: self.pool.get('ir.sequence').get(cr, uid, 'stock.picking'),
+        'name': lambda self,cr,uid,context: '/',
         'active': lambda *a: 1,
         'state': lambda *a: 'draft',
         'move_type': lambda *a: 'direct',
@@ -444,7 +448,7 @@ class stock_picking(osv.osv):
         if default is None:
             default = {}
         default = default.copy()
-        default['name'] = False
+        default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking')
         return super(stock_picking, self).copy(cr, uid, id, default, context)
 
     def onchange_partner_in(self, cr, uid, context, partner_id=None):
@@ -673,7 +677,7 @@ class stock_picking(osv.osv):
             else:
                 invoice_vals = {
                     'name': picking.name,
-                    'origin': str(picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
+                    'origin': (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
                     'type': type,
                     'account_id': account_id,
                     'partner_id': partner.id,
@@ -753,6 +757,14 @@ stock_picking()
 
 class stock_production_lot(osv.osv):
 
+    def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
+        res = super(stock_production_lot, self).search(cr, uid, args, offset, limit, order, context=context, count=count)
+        if res:
+            return [k for k,v in self._get_stock(cr, uid, res, 'stock_available', None, context).items() if v]
+        return res
+    
     def name_get(self, cr, uid, ids, context={}):
         if not ids:
             return []
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/stock_sequence.xml
index 8346ce28342..8eeea653ce7 100644
--- a/addons/stock/stock_sequence.xml
+++ b/addons/stock/stock_sequence.xml
@@ -30,7 +30,6 @@
             <field name="padding">7</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
-            <field eval="False" name="active"/>
         </record>
         
         <record id="sequence_type_tracking" model="ir.sequence.type">
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
index 01987a0a072..2223af453f1 100644
--- a/addons/wiki/wizard/open_page.py
+++ b/addons/wiki/wizard/open_page.py
@@ -39,7 +39,7 @@ class wiz_timesheet_open(wizard.interface):
         group = pool.get('wiki.groups.link').browse(cr, uid, group_ids[0])
         
         value = {
-            'context': "{'group_id':%d}" % (group.group_id.id),
+            'context': "{'group_id':%d, 'section':%s}" % (group.group_id.id, group.group_id.section),
             'domain': "[('group_id','child_of',[%s])]" % (group.group_id.id),
             'name': 'Wiki Page',
             'view_type': 'form',