[MERGE] merged with main trunk

bzr revid: qdp-launchpad@openerp.com-20120516160115-ufgnhjj8x8hb5mm7

diff --cc addons/l10n_fr/__openerp__.py
index 26ec91c,d15a423..99849d6
--- 1/addons/l10n_fr/__openerp__.py
--- 2/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@@ -46,12 -40,13 +46,13 @@@ Credits: Sistheo, Zeekom, CrysaLEAD, Ak
      "depends" : ['base_iban', 'account', 'account_chart', 'base_vat', 'l10n_fr_rib'],
      "init_xml" : [],
      "update_xml" : [
 -        "fr_report_demo.xml",
 -        "plan_comptable_general_demo.xml",
 +        "fr_report.xml",
 +        "plan_comptable_general.xml",
+         "l10n_fr_view.xml",
          "l10n_fr_wizard.xml",
 -        "fr_pcg_taxes_demo.xml",
 -        "fr_tax_demo.xml",
 -        "fr_fiscal_templates_demo.xml",
 +        "fr_pcg_taxes.xml",
 +        "fr_tax.xml",
 +        "fr_fiscal_templates.xml",
          "security/ir.model.access.csv",
          "wizard/fr_report_bilan_view.xml",
          "wizard/fr_report_compute_resultant_view.xml",