diff --git a/addons/account/account.py b/addons/account/account.py
index 75bfc891980..26af7a5f9bd 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2905,7 +2905,7 @@ class account_fiscal_position_template(osv.osv):
         obj_fiscal_position = self.pool.get('account.fiscal.position')
         fp_ids = self.search(cr, uid, [('chart_template_id', '=', chart_temp_id)])
         for position in self.browse(cr, uid, fp_ids, context=context):
-            new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name})
+            new_fp = obj_fiscal_position.create(cr, uid, {'company_id': company_id, 'name': position.name, 'note': position.note})
             for tax in position.tax_ids:
                 obj_tax_fp.create(cr, uid, {
                     'tax_src_id': tax_template_ref[tax.tax_src_id.id],
diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 81a1875b648..ed742309114 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.po
@@ -7,21 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-05-17 13:09+0000\n"
+"Last-Translator: Peter <herczegp@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 04:49+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "előző hónap"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -3962,7 +3961,7 @@ msgstr "Gyűjtőkód karton"
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
 msgid "Assets"
-msgstr ""
+msgstr "Eszközök"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -6825,7 +6824,7 @@ msgstr ""
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "JRNL"
-msgstr ""
+msgstr "Napló"
 
 #. module: account
 #: view:account.partner.balance:0
diff --git a/addons/account_asset/i18n/ja.po b/addons/account_asset/i18n/ja.po
index ad2944415f1..c5282d456e3 100644
--- a/addons/account_asset/i18n/ja.po
+++ b/addons/account_asset/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-10 18:07+0000\n"
-"Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+"PO-Revision-Date: 2012-05-16 19:05+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-11 05:14+0000\n"
-"X-Generator: Launchpad (build 15225)\n"
+"X-Launchpad-Export-Date: 2012-05-17 04:37+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -196,7 +196,7 @@ msgstr "会計エントリーにおいて貸方または借方の値が誤って
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,nbr:0
 msgid "# of Depreciation Lines"
-msgstr "減価償却行の番号"
+msgstr "減価償却行の数"
 
 #. module: account_asset
 #: view:asset.asset.report:0
diff --git a/addons/account_invoice_layout/i18n/th.po b/addons/account_invoice_layout/i18n/th.po
new file mode 100644
index 00000000000..3a68fe9766f
--- /dev/null
+++ b/addons/account_invoice_layout/i18n/th.po
@@ -0,0 +1,355 @@
+# Thai translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-05-17 04:29+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Thai <th@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Sub Total"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Note:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Cancelled Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+#: field:notify.message,name:0
+msgid "Title"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Disc. (%)"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Note"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Print"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:notify.message,msg:0
+msgid ""
+"This notification will appear at the bottom of the Invoices when printed."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Unit Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_notify_message
+msgid "Notify By Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "VAT :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tel. :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "PRO-FORMA"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice,abstract_line_ids:0
+msgid "Invoice Lines"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.line:0
+msgid "Seq."
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_finan_config_notify_message
+msgid "Notification Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Customer Code"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.line,sequence:0
+msgid "Gives the sequence order when displaying a list of invoice lines."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Price"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Invoice Date"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Taxes:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,functional_field:0
+msgid "Source Account"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.notify_mesage_tree_form
+msgid "Write Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Base"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Page Break"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+#: field:notify.message,msg:0
+msgid "Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: help:account.invoice.special.msg,message:0
+msgid "Message to Print at the bottom of report"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Quantity"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Fax :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Select Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Messages"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Product"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Description / Taxes"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:notify.message,msg:account_invoice_layout.demo_message1
+msgid "ERP & CRM Solutions..."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Net Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Total :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Draft Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,sequence:0
+msgid "Sequence Number"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
+msgid "Account Invoice Special Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Origin"
+msgstr ""
+
+#. module: account_invoice_layout
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_invoice_layout
+#: selection:account.invoice.line,state:0
+msgid "Separator Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_1
+msgid "Invoices"
+msgstr ""
+
+#. module: account_invoice_layout
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Tax"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.model,name:account_invoice_layout.model_account_invoice_line
+msgid "Invoice Line"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+msgid "Net Total:"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.actions.act_window,name:account_invoice_layout.action_account_invoice_special_msg
+#: model:ir.actions.report.xml,name:account_invoice_layout.account_invoices_layout_message
+msgid "Invoices and Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.line,state:0
+msgid "Type"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:notify.message:0
+msgid "Write a notification or a wishful message."
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: model:ir.model,name:account_invoice_layout.model_account_invoice
+#: report:notify_account.invoice:0
+msgid "Invoice"
+msgstr ""
+
+#. module: account_invoice_layout
+#: view:account.invoice.special.msg:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:account.invoice.layout:0
+#: report:notify_account.invoice:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: account_invoice_layout
+#: field:account.invoice.special.msg,message:0
+msgid "Message"
+msgstr ""
+
+#. module: account_invoice_layout
+#: report:notify_account.invoice:0
+msgid "Taxes :"
+msgstr ""
+
+#. module: account_invoice_layout
+#: model:ir.ui.menu,name:account_invoice_layout.menu_notify_mesage_tree_form
+msgid "All Notification Messages"
+msgstr ""
diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po
index 970508b5e7f..fda665e6fa9 100644
--- a/addons/account_voucher/i18n/ja.po
+++ b/addons/account_voucher/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-05-15 04:42+0000\n"
+"PO-Revision-Date: 2012-05-16 19:07+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-16 04:50+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-05-17 04:36+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
@@ -364,7 +364,7 @@ msgstr "会社名は固有でなければいけません。"
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,nbr:0
 msgid "# of Voucher Lines"
-msgstr "バウチャー行の番号"
+msgstr "バウチャー行の数"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,type:0
diff --git a/addons/anonymization/i18n/ja.po b/addons/anonymization/i18n/ja.po
index 8a2c195fad7..a102bceecc7 100644
--- a/addons/anonymization/i18n/ja.po
+++ b/addons/anonymization/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-16 04:51+0000\n"
-"X-Generator: Launchpad (build 15247)\n"
+"X-Launchpad-Export-Date: 2012-05-17 04:36+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: anonymization
 #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
diff --git a/addons/association/i18n/ja.po b/addons/association/i18n/ja.po
index 02e034238c6..6de481b5eb5 100644
--- a/addons/association/i18n/ja.po
+++ b/addons/association/i18n/ja.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2012-04-08 06:15+0000\n"
-"Last-Translator: Masaki Yamaya <Unknown>\n"
+"PO-Revision-Date: 2012-05-16 18:27+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-04-09 04:56+0000\n"
-"X-Generator: Launchpad (build 15060)\n"
+"X-Launchpad-Export-Date: 2012-05-17 04:36+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
@@ -35,7 +35,7 @@ msgstr "物事を完了"
 #. module: association
 #: model:ir.module.module,description:association.module_meta_information
 msgid "This module is to create Profile for Associates"
-msgstr ""
+msgstr "このモジュールは協会のためのプロファイルを作成します。"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,progress:0
@@ -47,7 +47,7 @@ msgstr "設定を進行中"
 msgid ""
 "Here are specific applications related to the Association Profile you "
 "selected."
-msgstr ""
+msgstr "ここでは選択した協会のプロファイルに関連する特別なアプリケーションです。"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
@@ -57,7 +57,7 @@ msgstr "タイトル"
 #. module: association
 #: help:profile.association.config.install_modules_wizard,event_project:0
 msgid "Helps you to manage and organize your events."
-msgstr ""
+msgstr "イベントの管理と整理を助けます。"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,config_logo:0
@@ -69,7 +69,7 @@ msgstr "画像"
 msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
-msgstr ""
+msgstr "従業員の費用を追跡管理します。費用がプロジェクト関連である場合、顧客に自動的に再度の請求書を送ります。"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
@@ -77,41 +77,42 @@ msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
+"GTDは自分自身と自分のタスクを効果的に整理する方法です。このモジュールはOpenERPのプロジェクト管理とGDTの原理を完全に統合しています。"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Resources Management"
-msgstr ""
+msgstr "資源管理"
 
 #. module: association
 #: model:ir.module.module,shortdesc:association.module_meta_information
 msgid "Association profile"
-msgstr ""
+msgstr "協会プロファイル"
 
 #. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
-msgstr ""
+msgstr "費用追跡"
 
 #. module: association
 #: model:ir.actions.act_window,name:association.action_config_install_module
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Association Application Configuration"
-msgstr ""
+msgstr "協会アプリケーション設定"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,wiki:0
 msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
-msgstr ""
+msgstr "ビジネス知識を記録し追跡して、それを従業員の間で共有するために、Wikiページとページグループの作成ができます。"
 
 #. module: association
 #: help:profile.association.config.install_modules_wizard,project:0
 msgid ""
 "Helps you manage your projects and tasks by tracking them, generating "
 "plannings, etc..."
-msgstr ""
+msgstr "プロジェクトやタスクを追跡，計画生成などすることにより、あなたのプロジェクトとタスクの管理を補助します。"
 
 #. module: association
 #: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
@@ -121,15 +122,15 @@ msgstr ""
 #. module: association
 #: field:profile.association.config.install_modules_wizard,event_project:0
 msgid "Events"
-msgstr ""
+msgstr "イベント"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
-msgstr ""
+msgstr "プロジェクト管理"
 
 #. module: association
 #: view:profile.association.config.install_modules_wizard:0
 msgid "Configure"
-msgstr ""
+msgstr "設定"
diff --git a/addons/auction/i18n/ja.po b/addons/auction/i18n/ja.po
new file mode 100644
index 00000000000..2504ec58ca0
--- /dev/null
+++ b/addons/auction/i18n/ja.po
@@ -0,0 +1,2359 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-05-18 04:37+0000\n"
+"Last-Translator: Akira Hiyama <Unknown>\n"
+"Language-Team: Japanese <ja@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_report_menu
+msgid "Reporting"
+msgstr "レポート"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_taken
+msgid "Auction taken"
+msgstr "オークション実施"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Set to draft"
+msgstr "ドラフトに設定"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,partner_id:0
+#: field:auction.lots,seller_id:0
+#: view:report.auction:0
+#: field:report.auction,seller:0
+msgid "Seller"
+msgstr "出品者"
+
+#. module: auction
+#: field:auction.lots,name:0
+msgid "Title"
+msgstr "タイトル"
+
+#. module: auction
+#: field:auction.lots.sms.send,text:0
+msgid "SMS Message"
+msgstr "SMSメッセージ"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid " "
+msgstr " "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Warning, Erase The Object Adjudication Price and Its Buyer!"
+msgstr "警告。オークションの落札価格オブジェクトと買い手を削除します。"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id1:0
+msgid "First Bank Statement For Buyer"
+msgstr "買い手の第１の銀行取引明細書"
+
+#. module: auction
+#: field:auction.bid_line,lot_id:0
+#: field:auction.lot.history,lot_id:0
+msgid "Object"
+msgstr "オブジェクト"
+
+#. module: auction
+#: field:report.auction.object.date,obj_num:0
+msgid "# of Objects"
+msgstr "オブジェクトの数"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Authors"
+msgstr "著者"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.lots:0
+#: field:auction.lots,ach_uid:0
+#: field:auction.lots.buyer_map,ach_uid:0
+#: field:auction.lots.make.invoice.buyer,buyer_id:0
+#: field:auction.pay.buy,buyer_id:0
+#: report:buyer.list:0
+#: view:report.auction:0
+#: field:report.auction,buyer:0
+#: report:report.auction.buyer.result:0
+msgid "Buyer"
+msgstr "買い手"
+
+#. module: auction
+#: field:report.auction,object:0
+msgid "No of objects"
+msgstr "オブジェクトの数"
+
+#. module: auction
+#: help:auction.lots,paid_vnd:0
+msgid ""
+"When state of Seller Invoice is 'Paid', this field is selected as True."
+msgstr "出品者の請求書が支払済の場合、この項目はTrueとして選択されます。"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of paid items (based on invoices):"
+msgstr "支払済項目の数（請求書に基づく）："
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border"
+msgstr "預け金境界"
+
+#. module: auction
+#: field:auction.lots.make.invoice,amount:0
+#: field:auction.lots.make.invoice.buyer,amount:0
+msgid "Invoiced Amount"
+msgstr "請求金額"
+
+#. module: auction
+#: help:auction.lots,name:0
+msgid "Auction object name"
+msgstr "オークションオブジェクト名"
+
+#. module: auction
+#: model:ir.model,name:auction.model_aie_category
+msgid "aie.category"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,amount:0
+#: field:auction.pay.buy,amount:0
+#: field:auction.pay.buy,amount2:0
+#: field:auction.pay.buy,amount3:0
+msgid "Amount"
+msgstr "金額"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_deposit_border
+#: model:ir.ui.menu,name:auction.menu_auction_deposit_border
+msgid "Deposit border"
+msgstr "預け金境界"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Reference"
+msgstr "参照"
+
+#. module: auction
+#: help:auction.dates,state:0
+msgid ""
+"When auction starts the state is 'Draft'.\n"
+" At the end of auction, the state becomes 'Closed'."
+msgstr ""
+"オークションが開始される時に状態はドラフトとなります。\n"
+"オークションが終了すると状態は閉鎖済となります。"
+
+#. module: auction
+#: field:auction.dates,account_analytic_id:0
+msgid "Analytic Account"
+msgstr "分析アカウント"
+
+#. module: auction
+#: help:auction.pay.buy,amount3:0
+msgid "Amount For Third Bank Statement"
+msgstr "第３の銀行取引明細書金額"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buy object"
+msgstr "オブジェクトの購入"
+
+#. module: auction
+#: field:auction.lots,lot_num:0
+msgid "List Number"
+msgstr "リスト番号"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Date:"
+msgstr "日付:"
+
+#. module: auction
+#: field:auction.deposit.cost,name:0
+msgid "Cost Name"
+msgstr "経費の名前"
+
+#. module: auction
+#: view:auction.dates:0
+#: field:auction.dates,state:0
+#: view:auction.lots:0
+#: field:auction.lots,state:0
+#: view:report.auction:0
+#: field:report.auction,state:0
+msgid "State"
+msgstr "状態"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "First Auction Date"
+msgstr "最初のオークション日"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "January"
+msgstr "1月"
+
+#. module: auction
+#: help:auction.lot.category,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the auction "
+"lot category without removing it."
+msgstr "アクティブな項目をFalseに設定すると、項目を削除することなくオークションの出品物分類を非表示にできます。"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Ref"
+msgstr "参照"
+
+#. module: auction
+#: field:report.auction,total_price:0
+msgid "Total Price"
+msgstr "合計価格"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Total Adj."
+msgstr "合計落札"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS - Gateway: clickatell','Bulk SMS Send"
+msgstr "SMS - ゲートウェイ：clickatellによる大量のSMS送信"
+
+#. module: auction
+#: help:auction.lots,costs:0
+msgid "Deposit cost"
+msgstr "預け金の経費"
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.auction,state:0
+#: selection:report.object.encoded,state:0
+msgid "Unsold"
+msgstr "売れず"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Search Auction deposit"
+msgstr "オークション預け金の検索"
+
+#. module: auction
+#: help:auction.lots,lot_num:0
+msgid "List number in depositer inventory"
+msgstr "預け入れ人目録のリスト番号"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Items"
+msgstr "項目"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax5
+#: field:auction.dates,seller_costs:0
+msgid "Seller Costs"
+msgstr "出品者の経費"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.bid_line:0
+#: view:auction.lots:0
+#: field:auction.lots,bid_lines:0
+#: model:ir.actions.report.xml,name:auction.bid_auction
+#: model:ir.ui.menu,name:auction.menu_action_bid_open
+msgid "Bids"
+msgstr "入札"
+
+#. module: auction
+#: field:report.auction,gross_revenue:0
+msgid "Gross Revenue"
+msgstr "総額収入"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Buyer Map"
+msgstr "買い手マップ"
+
+#. module: auction
+#: field:report.object.encoded,obj_ret:0
+msgid "# obj ret"
+msgstr "オブジェクト番号"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_bid
+msgid "Bid Auctions"
+msgstr "入札オークション"
+
+#. module: auction
+#: help:auction.lots,image:0
+msgid "Object Image"
+msgstr "オブジェクト画像"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#, python-format
+msgid "No buyer is set for this lot."
+msgstr "この出品物には買い手がセットされていません。"
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "The Buyer \"%s\" has no Invoice Address."
+msgstr "買い手 %s は請求書の住所がありません。"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_object_categories
+msgid "Auction object Categories"
+msgstr "オークションオブジェクトの分類"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit_cost
+msgid "Auction Deposit Cost"
+msgstr "オークション預け金の経費"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Border Form"
+msgstr "預け金境界フォーム"
+
+#. module: auction
+#: help:auction.lots,statement_id:0
+msgid "Bank statement line for given buyer"
+msgstr "所定の買い手のための銀行取引明細書行"
+
+#. module: auction
+#: field:auction.lot.category,aie_categ:0
+msgid "Category"
+msgstr "分類"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_view_auction_buyer_map
+msgid "Map buyer username to Partners"
+msgstr "パートナへの買い手ユーザ名のマップ"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Search Auction Lots"
+msgstr "オークション出品物の検索"
+
+#. module: auction
+#: field:report.auction,net_revenue:0
+msgid "Net Revenue"
+msgstr "純収入"
+
+#. module: auction
+#: field:report.auction.adjudication,state:0
+#: field:report.object.encoded,state:0
+msgid "Status"
+msgstr "状態"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_sms_send
+msgid "SMS Send"
+msgstr "SMS送信"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "August"
+msgstr "8月"
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+msgid "Sold"
+msgstr "売却済"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "June"
+msgstr "6月"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#, python-format
+msgid "No Lots belong to this Auction Date"
+msgstr "このオークション日付に沿う出品物はありません。"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "New Object"
+msgstr "新オブジェクト"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "October"
+msgstr "10月"
+
+#. module: auction
+#: field:auction.bid_line,name:0
+msgid "Bid date"
+msgstr "入札日"
+
+#. module: auction
+#: field:auction.dates,acc_expense:0
+msgid "Expense Account"
+msgstr "費用勘定"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_wizard_emporte
+msgid "Deliveries Management"
+msgstr "配達管理"
+
+#. module: auction
+#: field:auction.lots,obj_desc:0
+msgid "Object Description"
+msgstr "オブジェクトの説明"
+
+#. module: auction
+#: field:auction.lots,artist2_id:0
+msgid "Artist/Author2"
+msgstr "作者 / 著者2"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line1"
+msgstr "行1"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice_buyer
+msgid "Make Invoice for Buyer"
+msgstr "買い手の請求書作成"
+
+#. module: auction
+#: field:auction.lots,gross_revenue:0
+#: field:report.object.encoded,gross_revenue:0
+msgid "Gross revenue"
+msgstr "総収入"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_pay_buy
+msgid "Pay objects of the buyer"
+msgstr "買い手のオブジェクトの支払"
+
+#. module: auction
+#: help:auction.dates,auction2:0
+msgid "End date of auction"
+msgstr "オークション終了日"
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "Send SMS"
+msgstr "SMS を送信"
+
+#. module: auction
+#: field:auction.lots,name2:0
+msgid "Short Description (2)"
+msgstr "短い説明（2）"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_buyers_menu
+msgid "Buyers"
+msgstr "買い手"
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Object Category"
+msgstr "オブジェクト分類"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id4
+msgid "VAT 12%"
+msgstr "消費税 12%"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Invoices"
+msgstr "買い手請求書"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.res_w_buyer
+msgid "Results with buyer"
+msgstr "買い手の結果"
+
+#. module: auction
+#: field:auction.bid_line,price:0
+msgid "Maximum Price"
+msgstr "最高価格"
+
+#. module: auction
+#: help:auction.dates,auction1:0
+msgid "Start date of auction"
+msgstr "オークション開始日"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_auction_move
+msgid "Auction Move"
+msgstr "オークションの動作"
+
+#. module: auction
+#: help:auction.dates,buyer_costs:0
+msgid "Account tax for buyer"
+msgstr "買い手に対する口座の税金"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Next Auction"
+msgstr "次のオークション"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Select lots which are Sold"
+msgstr "売却済出品物の選択"
+
+#. module: auction
+#: field:auction.lots,statement_id:0
+msgid "Payment"
+msgstr "支払"
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "The object \"%s\" has no buyer assigned."
+msgstr "オブジェクト %s は買い手が割り当てられていません。"
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Keep until sold"
+msgstr "売却まで"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Last Auction Date"
+msgstr "最新オークション日"
+
+#. module: auction
+#: field:report.object.encoded,obj_num:0
+msgid "# of Encoded obj."
+msgstr "エンコード済オブジェクトの数"
+
+#. module: auction
+#: field:auction.lots,paid_vnd:0
+msgid "Seller Paid"
+msgstr "出品者支払"
+
+#. module: auction
+#: view:board.board:0
+#: view:report.object.encoded:0
+msgid "Objects statistics"
+msgstr "オブジェクトの統計"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of sellers:"
+msgstr "出品者の数"
+
+#. module: auction
+#: field:report.auction,date:0
+#: field:report.object.encoded,date:0
+msgid "Create Date"
+msgstr "作成日"
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:report.object.encoded,state:0
+msgid "Invoiced"
+msgstr "請求済"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items taken away:"
+msgstr "取り除かれた項目の数"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction
+#: view:report.auction:0
+msgid "Auction's Summary"
+msgstr "オークションの概要"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "%)"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer Information"
+msgstr "買い手情報"
+
+#. module: auction
+#: help:auction.lots,gross_revenue:0
+msgid "Buyer Price - Seller Price"
+msgstr "買い手価格 - 出品者価格"
+
+#. module: auction
+#: field:auction.lots.make.invoice,objects:0
+#: field:auction.lots.make.invoice.buyer,objects:0
+msgid "# of objects"
+msgstr "オブジェクトの数"
+
+#. module: auction
+#: field:auction.lots,lot_est2:0
+msgid "Maximum Estimation"
+msgstr "見積りの最高"
+
+#. module: auction
+#: field:auction.lots,buyer_price:0
+msgid "Buyer price"
+msgstr "買い手価格"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Bids Details"
+msgstr "入札詳細"
+
+#. module: auction
+#: field:auction.lots,is_ok:0
+msgid "Buyer's payment"
+msgstr "買い手の支払"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "End of auction"
+msgstr "オークションの終了"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_catalog_flagey_wizard
+#: model:ir.model,name:auction.model_auction_catalog_flagey
+msgid "Auction Catalog Flagey"
+msgstr "Flageyのオークションカタログ"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "March"
+msgstr "3月"
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax4
+msgid "Seller Costs1"
+msgstr "出品者経費1"
+
+#. module: auction
+#: field:auction.deposit,create_uid:0
+#: field:auction.lots,create_uid:0
+msgid "Created by"
+msgstr "作者"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of buyers:"
+msgstr "買い手の数："
+
+#. module: auction
+#: field:auction.lots,costs:0
+msgid "Indirect costs"
+msgstr "間接経費"
+
+#. module: auction
+#: help:auction.dates,seller_costs:0
+msgid "Account tax for seller"
+msgstr "出品者に対する口座の税金"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:67
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "UserError"
+msgstr "ユーザエラー"
+
+#. module: auction
+#: field:auction.dates,journal_seller_id:0
+msgid "Seller Journal"
+msgstr "出品者仕訳帳"
+
+#. module: auction
+#: view:auction.dates:0
+#: selection:auction.dates,state:0
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+#: view:report.auction:0
+#: selection:report.auction,state:0
+#: selection:report.auction.adjudication,state:0
+#: selection:report.object.encoded,state:0
+msgid "Draft"
+msgstr "ドラフト"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoiced Auction"
+msgstr "オークションの請求"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print"
+msgstr "印刷"
+
+#. module: auction
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Type"
+msgstr "タイプ"
+
+#. module: auction
+#: help:aie.category,child_ids:0
+msgid "children aie category"
+msgstr "子は分類を持つ"
+
+#. module: auction
+#: help:auction.lots,ach_emp:0
+msgid "When state is Taken Away, this field is marked as True"
+msgstr "状態が取り除かれた時に、この項目はTrueにマークされます。"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_taken
+msgid "Gestion emporte"
+msgstr "管理を伴う"
+
+#. module: auction
+#: view:auction.bid:0
+#: report:auction.bids:0
+#: view:auction.dates:0
+#: view:auction.lots:0
+#: field:auction.lots,auction_id:0
+#: report:auction.total.rml:0
+#: model:ir.module.category,name:auction.module_category_auction
+#: model:ir.ui.menu,name:auction.auction_menu_root
+#: view:report.auction:0
+msgid "Auction"
+msgstr "オークション"
+
+#. module: auction
+#: view:auction.lot.category:0
+#: model:ir.ui.menu,name:auction.menu_auction_object_cat
+msgid "Object Categories"
+msgstr "オブジェクト分類"
+
+#. module: auction
+#: field:auction.lots.sms.send,app_id:0
+msgid "API ID"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,name:0
+#: field:auction.bid_line,bid_id:0
+msgid "Bid ID"
+msgstr "入札ID"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Min Estimate:"
+msgstr "最低見積り："
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "September"
+msgstr "9月"
+
+#. module: auction
+#: field:report.auction,net_margin:0
+msgid "Net Margin"
+msgstr "実質利鞘"
+
+#. module: auction
+#: field:auction.lots,vnd_lim_net:0
+msgid "Net limit ?"
+msgstr "実質上限は？"
+
+#. module: auction
+#: field:aie.category,child_ids:0
+msgid "unknown"
+msgstr "不明"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of commissions:"
+msgstr "手数料の数："
+
+#. module: auction
+#: field:auction.bid_line,auction:0
+#: field:auction.dates,name:0
+msgid "Auction Name"
+msgstr "オークション名"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_seller
+msgid "Seller Costs (12%)"
+msgstr "出品者経費（12%）"
+
+#. module: auction
+#: field:aie.category,parent_id:0
+msgid "Parent aie Category"
+msgstr "親は分類を持つ"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary"
+msgstr "オークション概要"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "(Keep empty for automatic number)"
+msgstr "（自動番号のため空のままとして下さい）"
+
+#. module: auction
+#: code:addons/auction/auction.py:578
+#, python-format
+msgid "No Invoice Address"
+msgstr "請求書住所がありません。"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_huissier
+msgid "Bailiffs Listing"
+msgstr "執行官リスト"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:103
+#: code:addons/auction/wizard/auction_lots_numerotate.py:129
+#, python-format
+msgid "This record does not exist !"
+msgstr "このレコードは存在しません。"
+
+#. module: auction
+#: field:auction.pay.buy,total:0
+msgid "Total Amount"
+msgstr "合計金額"
+
+#. module: auction
+#: help:auction.pay.buy,amount:0
+msgid "Amount For First Bank Statement"
+msgstr "第１の銀行取引明細書の金額"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_object_date
+#: view:report.auction.object.date:0
+msgid "Objects per day"
+msgstr "１日あたりのオブジェクト"
+
+#. module: auction
+#: help:auction.lots,author_right:0
+msgid "Account tax for author commission"
+msgstr "作者手数料の口座の税金"
+
+#. module: auction
+#: model:product.template,name:auction.monproduit_product_template
+msgid "Oeuvres a 21%"
+msgstr "作品は21％"
+
+#. module: auction
+#: field:report.object.encoded,adj:0
+msgid "Adj."
+msgstr "落札"
+
+#. module: auction
+#: field:auction.lot.history,name:0
+#: field:report.auction.adjudication,date:0
+msgid "Date"
+msgstr "日付"
+
+#. module: auction
+#: field:auction.lots,obj_ret:0
+msgid "Price retired"
+msgstr "撤退価格"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Extra Costs"
+msgstr "その他経費"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Map "
+msgstr "マップ "
+
+#. module: auction
+#: field:auction.lots,paid_ach:0
+msgid "Buyer Invoice Reconciled"
+msgstr "買い手請求書消し込み済"
+
+#. module: auction
+#: field:auction.deposit,date_dep:0
+msgid "Deposit date"
+msgstr "預入日"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.id_deposit
+msgid "Deposits"
+msgstr "預け金"
+
+#. module: auction
+#: field:auction.deposit,specific_cost_ids:0
+msgid "Specific Costs"
+msgstr "特別な経費"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "To pay ("
+msgstr "支払先（"
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer
+msgid "Buyer Costs (20%)"
+msgstr "買い手経費（20%）"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction
+msgid "Dashboard"
+msgstr "ダッシュボード"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.actions.act_window,name:auction.action_auction_dates_next
+#: model:ir.ui.menu,name:auction.auction_date_menu
+#: model:ir.ui.menu,name:auction.menu_auction_dates_next1
+msgid "Auctions"
+msgstr "オークション"
+
+#. module: auction
+#: view:board.board:0
+msgid "Total Adjudications"
+msgstr "合計落札"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_make_invoice
+msgid "Make invoice"
+msgstr "請求書作成"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "November"
+msgstr "11月"
+
+#. module: auction
+#: view:auction.dates:0
+#: view:auction.lots:0
+msgid "History"
+msgstr "履歴"
+
+#. module: auction
+#: field:aie.category,code:0
+msgid "Code"
+msgstr "コード"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Nr."
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.v_report_barcode_lot
+msgid "Barcode batch"
+msgstr "バーコードのひと束"
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Num"
+msgstr "番号"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+#: view:auction.taken:0
+msgid "Cancel"
+msgstr "キャンセル"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Buyer's Payment History"
+msgstr "買い手支払履歴"
+
+#. module: auction
+#: view:auction.artists:0
+#: field:auction.artists,biography:0
+msgid "Biography"
+msgstr "生い立ち"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Inventory"
+msgstr "在庫"
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay"
+msgstr "支払"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+msgid "Create Invoices for Seller"
+msgstr "出品者請求書の作成"
+
+#. module: auction
+#: field:report.object.encoded,obj_margin:0
+msgid "Net margin"
+msgstr "実質利鞘"
+
+#. module: auction
+#: help:auction.lots,lot_local:0
+msgid "Auction Location"
+msgstr "オークションの場所"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Analytic"
+msgstr "分析"
+
+#. module: auction
+#: help:auction.lots,paid_ach:0
+msgid ""
+"When state of Buyer Invoice is 'Paid', this field is selected as True."
+msgstr "買い手請求書が支払済状態である場合、この項目はTrueとして選択されます。"
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Cat.N"
+msgstr ""
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Decrease limit of 10%"
+msgstr "上限を10%減少させる"
+
+#. module: auction
+#: field:auction.dates,adj_total:0
+#: field:report.auction.adjudication,adj_total:0
+msgid "Total Adjudication"
+msgstr "合計落札"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice_buyer
+msgid "Invoice Buyer objects"
+msgstr "請求書の買い手オブジェクト"
+
+#. module: auction
+#: view:report.auction:0
+msgid "My Auction"
+msgstr "マイオークション"
+
+#. module: auction
+#: help:auction.lots,gross_margin:0
+msgid "(Gross Revenue*100.0)/ Object Price"
+msgstr "（総収入*100.0） / オブジェクト価格"
+
+#. module: auction
+#: field:auction.bid,contact_tel:0
+msgid "Contact Number"
+msgstr "連絡先番号"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Price"
+msgstr "価格"
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "-"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Photos"
+msgstr "写真"
+
+#. module: auction
+#: field:auction.lots.make.invoice,number:0
+#: field:auction.lots.make.invoice.buyer,number:0
+msgid "Invoice Number"
+msgstr "請求書番号"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:87
+#: code:addons/auction/wizard/auction_lots_numerotate.py:77
+#: code:addons/auction/wizard/auction_lots_numerotate.py:95
+#: code:addons/auction/wizard/auction_lots_numerotate.py:122
+#: code:addons/auction/wizard/auction_lots_numerotate.py:137
+#: code:addons/auction/wizard/auction_lots_numerotate.py:173
+#, python-format
+msgid "Active IDs not Found"
+msgstr "アクティブIDが見つかりません。"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:166
+#: code:addons/auction/wizard/auction_aie_send_result.py:117
+#, python-format
+msgid "Connection to WWW.Auction-in-Europe.com failed !"
+msgstr "WWW.Auction-in-Europe.com への接続が失敗しました。"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_bid
+#: model:ir.actions.act_window,name:auction.action_bid_open
+msgid "Open Bids"
+msgstr "公開入札"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.open_board_auction
+msgid "Auction board"
+msgstr "オークション委員会"
+
+#. module: auction
+#: field:aie.category,name:0
+#: view:auction.artists:0
+#: report:bids.lots:0
+msgid "Name"
+msgstr "氏名"
+
+#. module: auction
+#: field:auction.deposit,name:0
+#: view:auction.lots:0
+#: field:auction.lots,bord_vnd_id:0
+msgid "Depositer Inventory"
+msgstr "預け入れ人目録"
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "The Buyer has no Invoice Address."
+msgstr "買い手には請求書住所がありません。"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_adjudication_tree
+msgid "Auction Adjudication Report"
+msgstr "オークション落札レポート"
+
+#. module: auction
+#: field:auction.lots.sms.send,user:0
+msgid "Login"
+msgstr "ログイン"
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_auction_adjudication
+msgid "report_auction_adjudication"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_lots_3
+msgid "Seller Form"
+msgstr "出品者フォーム"
+
+#. module: auction
+#: field:auction.lots,lot_type:0
+#: field:report.auction,lot_type:0
+msgid "Object category"
+msgstr "オブジェクト分類"
+
+#. module: auction
+#: view:auction.taken:0
+msgid "Mark Lots"
+msgstr "出品物としてマーク"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots
+msgid "Auction Object"
+msgstr "オークションオブジェクト"
+
+#. module: auction
+#: field:auction.lots,obj_num:0
+#: field:auction.lots.enable,confirm_en:0
+msgid "Catalog Number"
+msgstr "カタログ番号"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Accounting"
+msgstr "会計"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.bid_phone
+msgid "Bids phones"
+msgstr "電話入札"
+
+#. module: auction
+#: field:report.auction,avg_estimation:0
+msgid "Avg estimation"
+msgstr "平均予想"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Debit:"
+msgstr "借方："
+
+#. module: auction
+#: code:addons/auction/wizard/auction_aie_send.py:166
+#: code:addons/auction/wizard/auction_aie_send_result.py:116
+#: code:addons/auction/wizard/auction_lots_buyer_map.py:70
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "Error"
+msgstr "エラー"
+
+#. module: auction
+#: field:auction.lots,author_right:0
+msgid "Author rights"
+msgstr "著作権"
+
+#. module: auction
+#: view:auction.bid:0
+#: view:auction.dates:0
+#: view:auction.deposit:0
+#: view:auction.lots:0
+#: view:report.auction:0
+msgid "Group By..."
+msgstr "グループ化…"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during last month."
+msgstr "先月間のオークション"
+
+#. module: auction
+#: help:auction.dates,journal_id:0
+msgid "Account journal for buyer"
+msgstr "買い手のための口座仕訳帳"
+
+#. module: auction
+#: field:auction.bid,bid_lines:0
+#: report:auction.bids:0
+#: report:bids.lots:0
+#: model:ir.model,name:auction.model_auction_bid_line
+msgid "Bid"
+msgstr "入札"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total net rev."
+msgstr "合計総収入"
+
+#. module: auction
+#: view:auction.lots.buyer_map:0
+msgid "Update"
+msgstr "更新"
+
+#. module: auction
+#: report:auction.total.rml:0
+#: model:ir.ui.menu,name:auction.auction_seller_menu
+msgid "Sellers"
+msgstr "出品者"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Draft Auction"
+msgstr "ドラフトオークション"
+
+#. module: auction
+#: help:auction.lots,lot_est2:0
+msgid "Maximum Estimate Price"
+msgstr "最高見積り額"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Notes"
+msgstr "注記"
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+msgid "Move to Auction date"
+msgstr "オークション日に移動"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of unsold items:"
+msgstr "売れ残り項目の数："
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Create Invoices"
+msgstr "請求書を作成"
+
+#. module: auction
+#: field:auction.bid,auction_id:0
+#: view:auction.dates:0
+#: field:auction.lots.auction.move,auction_id:0
+msgid "Auction Date"
+msgstr "オークション日"
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid ", ID"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Adj.("
+msgstr "落札（"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.lot_list_inv
+msgid "Lots List - Landscape"
+msgstr "出品物リスト - 横向き"
+
+#. module: auction
+#: view:auction.artists:0
+msgid "Author/Artist"
+msgstr "著者 / 作者"
+
+#. module: auction
+#: field:auction.lots,ach_login:0
+#: field:auction.lots.buyer_map,ach_login:0
+msgid "Buyer Username"
+msgstr "買い手ユーザ名"
+
+#. module: auction
+#: field:auction.lot.category,priority:0
+msgid "Priority"
+msgstr "優先度"
+
+#. module: auction
+#: view:board.board:0
+#: model:ir.actions.act_window,name:auction.action_report_latest_objects_tree
+msgid "Latest objects"
+msgstr "最新オブジェクト"
+
+#. module: auction
+#: field:auction.lots,lot_local:0
+msgid "Location"
+msgstr "場所"
+
+#. module: auction
+#: view:report.auction:0
+msgid "Month -1"
+msgstr "月 -1"
+
+#. module: auction
+#: help:auction.lots,is_ok:0
+msgid "When buyer pay for bank statement', this field is marked"
+msgstr "買い手が銀行取引明細書の支払をした時にこの項目はマークされます。"
+
+#. module: auction
+#: field:auction.lots,ach_emp:0
+msgid "Taken Away"
+msgstr "取り除き済"
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total gross rev."
+msgstr "合計総収入"
+
+#. module: auction
+#: help:auction.lots,lot_est1:0
+msgid "Minimum Estimate Price"
+msgstr "最低見積り額"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Date"
+msgstr "預入日"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_numerotate.py:145
+#, python-format
+msgid "This lot does not exist !"
+msgstr "この出品物は存在しません。"
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "July"
+msgstr "7月"
+
+#. module: auction
+#: field:auction.bid_line,call:0
+msgid "To be Called"
+msgstr "呼称"
+
+#. module: auction
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_report_auction_lots_estimation_adj_category_tree
+msgid "Min est/Adj/Max est"
+msgstr "最低見積り / 落札 / 最高見積り"
+
+#. module: auction
+#: field:auction.lots,lot_est1:0
+msgid "Minimum Estimation"
+msgstr "最低見積り額"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_sms_send
+msgid "Sms send "
+msgstr "SMS送信済 "
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: model:ir.actions.act_window,name:auction.action_auction_lots_auction_move
+msgid "Change Auction Date"
+msgstr "オークション日変更"
+
+#. module: auction
+#: field:auction.artists,birth_death_dates:0
+msgid "Lifespan"
+msgstr "寿命"
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,method:0
+msgid "Withdrawned method"
+msgstr "取り下げ方法"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Buyer Commissions"
+msgstr "買い手手数料"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction
+#: model:ir.ui.menu,name:auction.menu_report_auction
+msgid "Auction Analysis"
+msgstr "オークション分析"
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid "Payment aborted !"
+msgstr "支払は中止されました。"
+
+#. module: auction
+#: field:auction.lot.history,price:0
+msgid "Withdrawn price"
+msgstr "取り下げ価格"
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Beginning of the auction"
+msgstr "オークションの開始"
+
+#. module: auction
+#: help:auction.pay.buy,statement_id3:0
+msgid "Third Bank Statement For Buyer"
+msgstr "買い手の第３の銀行取引明細書"
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,month:0
+#: field:report.auction.object.date,month:0
+msgid "Month"
+msgstr "月"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Max Estimate:"
+msgstr "最高見積り"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Statistical"
+msgstr "統計的"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_deposit
+msgid "Auction Deposit Border"
+msgstr "オークション預け金境界"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_object_encoded_tree
+msgid "Object statistics"
+msgstr "オブジェクト統計値"
+
+#. module: auction
+#: help:auction.lots,net_margin:0
+msgid "(Net Revenue * 100)/ Object Price"
+msgstr "（実質収入*100） / オブジェクト価格"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_history
+msgid "Lot History"
+msgstr "出品物履歴"
+
+#. module: auction
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create invoices"
+msgstr "請求書作成"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id5
+msgid "VAT 5%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_buyer_map
+msgid "Map Buyer"
+msgstr "消費税5%"
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Lot"
+msgstr "出品物"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_object_date_tree
+msgid "Auction Object Date"
+msgstr "オークションオブジェクト日"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_artists
+msgid "auction.artists"
+msgstr ""
+
+#. module: auction
+#: field:report.auction,avg_price:0
+msgid "Avg Price."
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,statement_id2:0
+msgid "Second Bank Statement For Buyer"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,journal_id:0
+msgid "Buyer Journal"
+msgstr ""
+
+#. module: auction
+#: selection:auction.lots,state:0
+#: selection:report.object.encoded,state:0
+msgid "Paid"
+msgstr ""
+
+#. module: auction
+#: report:bids.lots:0
+#: report:bids.phones.details:0
+msgid "Phone"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.category,active:0
+msgid "Active"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Exposition Dates"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax1
+msgid "TVA"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,important:0
+msgid "To be Emphatized"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Total:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax2
+msgid "TVA1"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.object.date:0
+msgid "Objects per Day"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,seller_invoice_history:0
+#: field:auction.lots,sel_inv_id:0
+#: view:auction.lots.make.invoice:0
+msgid "Seller Invoice"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Objects by day"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo2:0
+msgid "Last exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:571
+#: code:addons/auction/auction.py:686
+#, python-format
+msgid "Missed buyer !"
+msgstr ""
+
+#. module: auction
+#: report:auction.code_bar_lot:0
+msgid "Flagey"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Auction manager "
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_lots_invoice.py:67
+#, python-format
+msgid ""
+"Two different buyers for the same invoice !\n"
+"Please correct this problem before invoicing"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Invoice"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Commissions"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,vnd_lim:0
+msgid "Seller limit"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,transfer:0
+msgid "Transfer"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line3"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Line2"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_ret:0
+msgid "Object Ret"
+msgstr ""
+
+#. module: auction
+#: view:report.auction.adjudication:0
+msgid "Total adjudication"
+msgstr "合計落札"
+
+#. module: auction
+#: selection:auction.deposit,method:0
+msgid "Contact the Seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.taken,lot_ids:0
+msgid "Lots Emportes"
+msgstr "出品物獲得"
+
+#. module: auction
+#: field:auction.lots,net_margin:0
+msgid "Net Margin (%)"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid ")"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Seller Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,lot_id:0
+#: view:auction.lots:0
+#: model:ir.actions.act_window,name:auction.action_all_objects
+#: model:ir.ui.menu,name:auction.auction_all_objects_menu
+msgid "Objects"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Invoices"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Paid:"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,total_neg:0
+msgid "Allow Negative Amount"
+msgstr ""
+
+#. module: auction
+#: help:auction.pay.buy,amount2:0
+msgid "Amount For Second Bank Statement"
+msgstr ""
+
+#. module: auction
+#: field:auction.lot.history,auction_id:0
+#: field:report.auction,auction:0
+#: field:report.auction.adjudication,name:0
+msgid "Auction date"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.sms.send:0
+msgid "SMS Text"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction1:0
+msgid "First Auction Day"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Create Invoices for Buyer"
+msgstr ""
+
+#. module: auction
+#: model:res.groups,name:auction.group_auction_manager
+msgid "Manager"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Names"
+msgstr ""
+
+#. module: auction
+#: view:auction.artists:0
+#: model:ir.ui.menu,name:auction.menu_auction_artist
+msgid "Artists"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay Objects"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,expo1:0
+msgid "Beginning exposition date for auction"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_line_open
+msgid "Open lots"
+msgstr "出品物を開く"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.act_auction_lot_open_deposit
+msgid "Deposit slip"
+msgstr "預入伝票"
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_enable
+msgid "Lots Enable"
+msgstr "出品物の有効化"
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Lots"
+msgstr "出品物"
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_artist
+msgid "Auction Artists"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,seller_price:0
+msgid "Seller price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax20
+msgid "Frais de vente0"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buy_id_list
+msgid "Buyer List"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "Buyer costs("
+msgstr ""
+
+#. module: auction
+#: field:auction.pay.buy,statement_id1:0
+#: field:auction.pay.buy,statement_id2:0
+#: field:auction.pay.buy,statement_id3:0
+msgid "Statement"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,seller_price:0
+#: help:auction.lots.make.invoice,amount:0
+msgid "Seller Price"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax6
+msgid "Frais de vente"
+msgstr ""
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id1
+msgid "VAT 1%"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax
+msgid "Droit d'auteur"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,expo1:0
+msgid "First Exposition Day"
+msgstr ""
+
+#. module: auction
+#: field:report.auction.object.date,name:0
+msgid "Created date"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,bord_vnd_id:0
+msgid ""
+"Provide deposit information: seller, Withdrawned Method, Object, Deposit "
+"Costs"
+msgstr "預け金情報の提供：出品者、取り下げ方法、オブジェクト、預け金経費"
+
+#. module: auction
+#: field:auction.lots,net_revenue:0
+#: field:report.object.encoded,net_revenue:0
+msgid "Net revenue"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_catalog_flagey_report.py:63
+#: code:addons/auction/wizard/auction_pay_buy.py:89
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_latest_doposit_tree
+msgid "Latest Deposits"
+msgstr "最終預け金"
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "# of items:"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.tax_buyer_author
+msgid "Author rights (4%)"
+msgstr ""
+
+#. module: auction
+#: field:report.object.encoded,estimation:0
+msgid "Estimation"
+msgstr ""
+
+#. module: auction
+#: view:auction.taken:0
+msgid "OK"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.buyer_form_id
+msgid "Buyer Form"
+msgstr ""
+
+#. module: auction
+#: field:auction.bid,partner_id:0
+msgid "Buyer Name"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,day:0
+msgid "Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_auction_lots_make_invoice
+msgid "Invoice Seller objects"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,gross_margin:0
+msgid "Gross Margin (%)"
+msgstr ""
+
+#. module: auction
+#: selection:auction.dates,state:0
+#: selection:report.auction.adjudication,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Search Next Auction Dates"
+msgstr ""
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Print Auction Catalog Flagey Report..."
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,ach_avance:0
+msgid "Buyer Advance"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_comm:0
+msgid "Commission"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Min/Adj/Max"
+msgstr "最低 / 落札 / 最高"
+
+#. module: auction
+#: view:auction.catalog.flagey:0
+msgid "Catalog Flagey Report"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,obj_price:0
+msgid "Object Price"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Bids Lines"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Catalog"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,auction_id:0
+msgid "Auction for object"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,account:0
+msgid "Destination Account"
+msgstr "宛先アカウント"
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_config_menu
+msgid "Configuration"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.act_window,name:auction.action_report_auction_object_date_tree_my
+msgid "My Auction Object Date"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:80
+#, python-format
+msgid ""
+"You should pay all the total: \"%.2f\" are missing to accomplish the payment."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_pay_buy
+msgid "Pay buy"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.auction_outils_menu
+msgid "Tools Bar Codes"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit.cost,deposit_id:0
+msgid "Deposit"
+msgstr "預け金"
+
+#. module: auction
+#: field:auction.dates,expo2:0
+msgid "Last Exposition Day"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lots_able
+msgid "Lots able"
+msgstr "出品可能"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id3
+msgid "VAT 10%"
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,name:0
+msgid "Artist/Author Name"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "December"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.lots,image:0
+msgid "Image"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,buyer_price:0
+#: help:auction.lots.make.invoice.buyer,amount:0
+msgid "Buyer Price"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_lot_category
+msgid "Auction Lots Category"
+msgstr "オークション出品物分類"
+
+#. module: auction
+#: model:account.tax.code,name:auction.account_tax_code_id2
+msgid "VAT 20%"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer_sel
+msgid "Auction payment for seller"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+#: selection:auction.lots,state:0
+msgid "Taken away"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.seller_form_id
+msgid "Seller List"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Total adj."
+msgstr "合計落札"
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Deposit Costs"
+msgstr "預け金経費"
+
+#. module: auction
+#: field:auction.lot.category,name:0
+msgid "Category Name"
+msgstr ""
+
+#. module: auction
+#: report:buyer.list:0
+msgid "........."
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction Summary tree view"
+msgstr "オークション概要のツリービュー"
+
+#. module: auction
+#: report:report.auction.buyer.result:0
+msgid "Adj"
+msgstr "落札"
+
+#. module: auction
+#: view:auction.dates:0
+#: model:ir.model,name:auction.model_auction_dates
+msgid "Auction Dates"
+msgstr ""
+
+#. module: auction
+#: model:ir.ui.menu,name:auction.menu_board_auction_open
+msgid "Auction DashBoard"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,user_id:0
+#: field:report.auction.adjudication,user_id:0
+#: field:report.auction.object.date,user_id:0
+#: field:report.object.encoded,user_id:0
+#: model:res.groups,name:auction.group_auction_user
+msgid "User"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/auction.py:692
+#, python-format
+msgid "Missed Address !"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,net_revenue:0
+msgid "Buyer Price - Seller Price - Indirect Cost"
+msgstr ""
+
+#. module: auction
+#: help:auction.lots,state:0
+msgid ""
+" * The 'Draft' state is used when a object is encoding as a new object.      "
+"           \n"
+"* The 'Unsold' state is used when object does not sold for long time, user "
+"can also set it as draft state after unsold.                 \n"
+"* The 'Paid' state is used when user pay for the object                 \n"
+"* The 'Sold' state is used when user buy the object."
+msgstr ""
+
+#. module: auction
+#: field:auction.artists,pseudo:0
+msgid "Pseudo"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots:0
+msgid "Not sold"
+msgstr ""
+
+#. module: auction
+#: model:account.tax,name:auction.auction_tax3
+#: field:auction.dates,buyer_costs:0
+msgid "Buyer Costs"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction Date:"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "Objects Description"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,buyer_invoice_history:0
+#: field:auction.lots,ach_inv_id:0
+#: view:auction.lots.make.invoice.buyer:0
+msgid "Buyer Invoice"
+msgstr ""
+
+#. module: auction
+#: report:auction.bids:0
+msgid "Tel"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,artist_id:0
+msgid "Artist/Author"
+msgstr ""
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.total_result1
+msgid "Auction Totals with lists"
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+msgid "General Information"
+msgstr ""
+
+#. module: auction
+#: view:auction.lots.auction.move:0
+#: view:auction.lots.buyer_map:0
+#: view:auction.lots.make.invoice:0
+#: view:auction.lots.make.invoice.buyer:0
+#: view:auction.lots.sms.send:0
+#: view:auction.pay.buy:0
+msgid "Close"
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_report_object_encoded
+msgid "Object encoded"
+msgstr ""
+
+#. module: auction
+#: view:auction.bid:0
+msgid "Search Auction Bid"
+msgstr ""
+
+#. module: auction
+#: report:bids.phones.details:0
+msgid "Est"
+msgstr ""
+
+#. module: auction
+#: view:auction.dates:0
+msgid "Seller Commissions"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "Object statistic"
+msgstr ""
+
+#. module: auction
+#: help:auction.dates,journal_seller_id:0
+msgid "Account journal for seller"
+msgstr ""
+
+#. module: auction
+#: field:auction.dates,auction2:0
+msgid "Last Auction Day"
+msgstr ""
+
+#. module: auction
+#: code:addons/auction/wizard/auction_pay_buy.py:89
+#, python-format
+msgid "No auction date for \"%s\": Please set one."
+msgstr ""
+
+#. module: auction
+#: view:auction.deposit:0
+#: field:auction.deposit,info:0
+#: report:bids.phones.details:0
+msgid "Description"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "May"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,obj_price:0
+msgid "Adjudication price"
+msgstr "落札価格"
+
+#. module: auction
+#: field:auction.dates,acc_income:0
+msgid "Income Account"
+msgstr "損益勘定"
+
+#. module: auction
+#: field:auction.lots.sms.send,password:0
+msgid "Password"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "February"
+msgstr ""
+
+#. module: auction
+#: selection:report.auction,month:0
+msgid "April"
+msgstr ""
+
+#. module: auction
+#: view:auction.pay.buy:0
+msgid "Pay objects"
+msgstr ""
+
+#. module: auction
+#: view:report.object.encoded:0
+msgid "# objects"
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Adjudication:"
+msgstr "落札："
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.details_bids_phones
+msgid "Bids per lot (phone)"
+msgstr "出品物ごとの入札（電話）"
+
+#. module: auction
+#: field:report.auction,buyer_login:0
+msgid "Buyer Login"
+msgstr ""
+
+#. module: auction
+#: field:auction.deposit,tax_id:0
+msgid "Expenses"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during current month."
+msgstr ""
+
+#. module: auction
+#: model:ir.model,name:auction.model_auction_payer
+msgid "Auction payer"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+msgid "Auction during current year."
+msgstr ""
+
+#. module: auction
+#: report:auction.total.rml:0
+msgid "Auction name:"
+msgstr ""
+
+#. module: auction
+#: view:board.board:0
+msgid "Latest deposits"
+msgstr "最終預け金"
+
+#. module: auction
+#: model:ir.actions.report.xml,name:auction.art2
+msgid "Artists Biography"
+msgstr ""
+
+#. module: auction
+#: view:report.auction:0
+#: field:report.auction,year:0
+msgid "Year"
+msgstr ""
+
+#. module: auction
+#: field:auction.lots,history_ids:0
+msgid "Auction history"
+msgstr ""
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 205d99ff6f6..1c3ce5d8570 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -401,7 +401,7 @@
         <field name="priority">20</field>
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
-                <div class="oe_form_topbar">
+                <div class="oe_form_topbar oe_form_topbar_hifirst">
                     <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" groups="base.group_no_one"/>
                     <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" groups="base.group_no_one"/>
                     <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" groups="base.group_no_one"/>
@@ -412,16 +412,19 @@
                     <div class="oe_right" groups="base.group_no_one">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' groups="base.group_no_one"/>
                     </div>
+                    <div class="oe_clear"/>
                 </div>
                 <sheet layout="auto">
-                <group colspan="4" col="3">
-                    <field name="name" required="1" nolabel="1" class="oe_form_title" width="80%%"/>
-                    <button string="Schedule/Log Call"
-                        name="%(opportunity2phonecall_act)d" icon="terp-call-start"
-                        type="action"/>
-                    <button string="Schedule Meeting" icon="gtk-redo"
-                        name="action_makeMeeting"
-                        type="object"/>
+                <group colspan="4" col="2" width="auto">
+                    <field name="name" required="1" nolabel="1" class="oe_form_title"/>
+                    <div class="oe_text_right">
+                        <button string="Schedule/Log Call"
+                            name="%(opportunity2phonecall_act)d" icon="terp-call-start"
+                            type="action"/>
+                        <button string="Schedule Meeting" icon="gtk-redo"
+                            name="action_makeMeeting"
+                            type="object"/>
+                    </div>
                 </group>
                 <group colspan="4" col="4" class="oe_form_group_label_border" style="margin-top: 20px;">
                     <field name="user_id"/>
diff --git a/addons/hr_recruitment/i18n/hu.po b/addons/hr_recruitment/i18n/hu.po
index feb7ccf4f81..87f9e8f4327 100644
--- a/addons/hr_recruitment/i18n/hu.po
+++ b/addons/hr_recruitment/i18n/hu.po
@@ -7,15 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2011-02-03 23:37+0000\n"
-"Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) "
-"<openerp@novotrade.hu>\n"
+"PO-Revision-Date: 2012-05-17 13:22+0000\n"
+"Last-Translator: Peter <herczegp@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:59+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-05-18 04:40+0000\n"
+"X-Generator: Launchpad (build 15259)\n"
 
 #. module: hr_recruitment
 #: help:hr.applicant,active:0
@@ -54,7 +53,7 @@ msgstr "Csoportosítás..."
 #. module: hr_recruitment
 #: field:hr.applicant,user_email:0
 msgid "User Email"
-msgstr ""
+msgstr "Felhasználó  email címe"
 
 #. module: hr_recruitment
 #: view:hr.applicant:0
@@ -247,7 +246,7 @@ msgstr "Javasolt fizetés"
 #. module: hr_recruitment
 #: view:hr.applicant:0
 msgid "Change Color"
-msgstr ""
+msgstr "Szín megváltoztatása"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
@@ -1100,7 +1099,7 @@ msgstr ""
 #. module: hr_recruitment
 #: model:ir.ui.menu,name:hr_recruitment.menu_hr_job
 msgid "Job Positions"
-msgstr ""
+msgstr "Álláspozíciók"
 
 #. module: hr_recruitment
 #: view:hr.recruitment.report:0
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index 839907c778a..99849d62649 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -27,7 +27,7 @@
 ##############################################################################
 {
     "name" : "France - Accounting",
-    "version" : "1.0",
+    "version" : "1.1",
     "author" : "OpenERP SA",
     "website": "http://www.openerp.com",
     "category" : "Localization/Account Charts",
@@ -35,17 +35,24 @@
 This is the module to manage the accounting chart for France in OpenERP.
 ========================================================================
 
-Credits: Sistheo Zeekom CrysaLEAD
+This module applies to companies based in France mainland. It doesn't apply to companies based in the DOM-TOMs (Guadeloupe, Martinique, Guyane, Réunion, Mayotte, etc...)
+
+This localisation module creates the VAT taxes of type "tax included" for purchases (it is notably required when you use the module "hr_expense"). Beware that these "tax included" VAT taxes are not managed by the fiscal positions provided by this module (because it is complex to manage both "tax excluded" and "tax included" scenarios in fiscal positions).
+
+This localisation module doesn't properly handle the scenario when a France-mainland company sells services to a company based in the DOMs. We could manage it in the fiscal positions, but it would require to differentiate between "product" VAT taxes and "service" VAT taxes. We consider that it is too "heavy" to have this by default in l10n_fr ; companies that sell services to DOM-based companies should update the configuration of their taxes and fiscal positions manually.
+
+Credits: Sistheo, Zeekom, CrysaLEAD, Akretion and Camptocamp.
 """,
     "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",
diff --git a/addons/l10n_fr/fr_fiscal_templates.xml b/addons/l10n_fr/fr_fiscal_templates.xml
new file mode 100644
index 00000000000..a7e202d47b8
--- /dev/null
+++ b/addons/l10n_fr/fr_fiscal_templates.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    <!-- = = = = = = = = = = = = = = = -->
+    <!-- Fiscal Position Templates     -->
+    <!-- = = = = = = = = = = = = = = = -->
+
+<!-- Position Géographique du partenaire -->
+        <record id="fiscal_position_template_intraeub2b" model="account.fiscal.position.template">
+            <field name="name">Intra-EU B2B</field>
+            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+            <field name="note">French VAT exemption according to articles 262 ter I (for products) and/or 283-2 (for services) of "CGI"</field>
+        </record>
+
+        <record id="fiscal_position_template_import_export" model="account.fiscal.position.template">
+            <field name="name">Import/Export + DOM-TOM</field>
+            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+            <field name="note">French VAT exemption according to articles 262 I of "CGI"</field>
+        </record>
+
+
+    <!-- = = = = = = = = = = = = = = = -->
+    <!-- Fiscal Position Tax Templates -->
+    <!-- = = = = = = = = = = = = = = = -->
+
+<!-- Par défaut, les produits doivent être paramétrés pour utiliser les taxes, paramétrées pour des numéro de comptes (nationaux) -->
+
+<!-- Zone Intracommunautaire B2B -->
+<!-- ventes -->
+<!-- 19,6% -->
+        <record id="fp_tax_template_intraeub2b_vt_normale" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_normale" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+<!-- 8,5% -->
+        <record id="fp_tax_template_intraeub2b_vt_specifique" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_specifique" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+<!-- 7% -->
+        <record id="fp_tax_template_intraeub2b_vt_specifique_1" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_specifique_1" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+<!-- 5,5% -->
+        <record id="fp_tax_template_intraeub2b_vt_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_reduite" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+<!-- 2,1% -->
+        <record id="fp_tax_template_intraeub2b_vt_super_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_super_reduite" />
+            <field name="tax_dest_id" ref="tva_intra_0" />
+        </record>
+<!-- achats -->
+<!-- 19,6% -->
+        <record id="fp_tax_template_intraeub2b_ha_normale_deduc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_normale" />
+            <field name="tax_dest_id" ref="tva_intra_normale" />
+        </record>
+        <record id="fp_tax_template_intraeub2b_ha_normale_acq" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_normale" />
+            <field name="tax_dest_id" ref="tva_acq_intra_normale" />
+        </record>
+<!-- 8,5% -->
+        <record id="fp_tax_template_intraeub2b_ha_specifique_deduc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_specifique" />
+            <field name="tax_dest_id" ref="tva_intra_specifique" />
+        </record>
+        <record id="fp_tax_template_intraeub2b_ha_specifique_acq" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_specifique" />
+            <field name="tax_dest_id" ref="tva_acq_intra_specifique" />
+        </record>
+<!-- 7% -->
+        <record id="fp_tax_template_intraeub2b_ha_specifique_1_deduc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_specifique_1" />
+            <field name="tax_dest_id" ref="tva_intra_specifique_1" />
+        </record>
+        <record id="fp_tax_template_intraeub2b_ha_specifique_1_acq" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_specifique_1" />
+            <field name="tax_dest_id" ref="tva_acq_intra_specifique_1" />
+        </record>
+<!-- 5,5% -->
+        <record id="fp_tax_template_intraeub2b_ha_reduite_deduc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_reduite" />
+            <field name="tax_dest_id" ref="tva_intra_reduite" />
+        </record>
+        <record id="fp_tax_template_intraeub2b_ha_reduite_acq" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_reduite" />
+            <field name="tax_dest_id" ref="tva_acq_intra_reduite" />
+        </record>
+<!-- 2,1% -->
+        <record id="fp_tax_template_intraeub2b_ha_super_reduite_deduc" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_super_reduite" />
+            <field name="tax_dest_id" ref="tva_intra_super_reduite" />
+        </record>
+        <record id="fp_tax_template_intraeub2b_ha_super_reduite_acq" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_intraeub2b" />
+            <field name="tax_src_id" ref="tva_acq_super_reduite" />
+            <field name="tax_dest_id" ref="tva_acq_intra_super_reduite" />
+        </record>
+
+<!-- Import/Export + DOM/TOM -->
+<!-- ventes -->
+<!-- 19,6% -->
+        <record id="fp_tax_template_impexp_vt_normale" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_normale" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+<!-- 8,5% -->
+        <record id="fp_tax_template_impexp_vt_specifique" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_specifique" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+<!-- 7% -->
+        <record id="fp_tax_template_impexp_vt_specifique_1" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_specifique_1" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+<!-- 5,5% -->
+        <record id="fp_tax_template_impexp_vt_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_reduite" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+<!-- 2,1% -->
+        <record id="fp_tax_template_impexp_vt_super_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_super_reduite" />
+            <field name="tax_dest_id" ref="tva_export_0" />
+        </record>
+
+<!-- achats -->
+<!-- 19,6% -->
+        <record id="fp_tax_template_impexp_ha_normale" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_acq_normale" />
+            <field name="tax_dest_id" ref="tva_import_0" />
+        </record>
+<!-- 8,5% -->
+        <record id="fp_tax_template_impexp_ha_specifique" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_acq_specifique" />
+            <field name="tax_dest_id" ref="tva_import_0" />
+        </record>
+<!-- 7% -->
+        <record id="fp_tax_template_impexp_ha_specifique_1" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_acq_specifique_1" />
+            <field name="tax_dest_id" ref="tva_import_0" />
+        </record>
+<!-- 5,5% -->
+        <record id="fp_tax_template_impexp_ha_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_acq_reduite" />
+            <field name="tax_dest_id" ref="tva_import_0" />
+        </record>
+<!-- 2,1% -->
+        <record id="fp_tax_template_impexp_ha_super_reduite" model="account.fiscal.position.tax.template">
+            <field name="position_id" ref="fiscal_position_template_import_export" />
+            <field name="tax_src_id" ref="tva_acq_super_reduite" />
+            <field name="tax_dest_id" ref="tva_import_0" />
+        </record>
+
+    </data>
+</openerp>
diff --git a/addons/l10n_fr/fr_fiscal_templates_demo.xml b/addons/l10n_fr/fr_fiscal_templates_demo.xml
deleted file mode 100644
index d3380581cba..00000000000
--- a/addons/l10n_fr/fr_fiscal_templates_demo.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-    <!-- = = = = = = = = = = = = = = = -->
-        <!-- Fiscal Position Templates     -->
-    <!-- = = = = = = = = = = = = = = = -->
-
-<!-- Position Géographique du partenaire -->
-        <record id="fiscal_position_template_1" model="account.fiscal.position.template">
-            <field name="name">France</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-        
-        <record id="fiscal_position_template_2" model="account.fiscal.position.template">
-            <field name="name">Zone Euro</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-        
-        <record id="fiscal_position_template_3" model="account.fiscal.position.template">
-            <field name="name">DOM-TOM</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-        
-        <record id="fiscal_position_template_4" model="account.fiscal.position.template">
-            <field name="name">Hors Euro</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-
-<!-- Immobilisations (substitution de taxes) -->
-        <record id="fiscal_position_template_5" model="account.fiscal.position.template">
-            <field name="name">France</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-
-<!-- TVA sur Débits ou Encaissements (substitution de comptes) -->
-        <record id="fiscal_position_template_6" model="account.fiscal.position.template">
-            <field name="name">TVA sur le débits</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-
-        <record id="fiscal_position_template_7" model="account.fiscal.position.template">
-            <field name="name">TVA sur les encaissements</field>
-            <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-        </record>
-
-
-    <!-- = = = = = = = = = = = = = = = -->
-    <!-- Fiscal Position Tax Templates -->
-    <!-- = = = = = = = = = = = = = = = -->
-
-<!-- Par défaut, les produits doivent être paramétrés pour utiliser les taxes, paramétrées pour des numéro de comptes (nationaux) -->
-
-<!-- Zone Euro == Intracomm -->
-<!-- ventes -->
-<!-- 19,6% -->
-    <record id="fiscal_position_tax_template_1" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_normale" />
-            <field name="tax_dest_id" ref="tva_intra_normale" />
-        </record>
-<!-- 8,5% - - >
-    <record id="fiscal_position_tax_template_2" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_specifique" />
-            <field name="tax_dest_id" ref="tva_intra_specifique" />
-        </record>
-<! - - 5,5% -->
-    <record id="fiscal_position_tax_template_3" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_reduite" />
-            <field name="tax_dest_id" ref="tva_intra_reduite" />
-        </record>
-<!-- 2,1% - - >
-    <record id="fiscal_position_tax_template_4" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_super_reduite" />
-            <field name="tax_dest_id" ref="tva_intra_super_reduite" />
-        </record>
-<! - - achats -->
-<!-- 19,6% -->
-    <record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_acq_normale" />
-            <field name="tax_dest_id" ref="tva_acq_intra_normale" />
-        </record>
-<!-- 8,5% - - >
-    <record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_acq_specifique" />
-            <field name="tax_dest_id" ref="tva_acq_intra_specifique" />
-        </record>
-<! - - 5,5% -->
-    <record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_acq_reduite" />
-            <field name="tax_dest_id" ref="tva_acq_intra_reduite" />
-        </record>
-<!-- 2,1% - - >
-    <record id="fiscal_position_tax_template_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_acq_super_reduite" />
-            <field name="tax_dest_id" ref="tva_acq_intra_super_reduite" />
-        </record>
-
-<! - - Hors Euro -->
-<!-- ventes -->
-<!-- 19,6% -->
-    <record id="fiscal_position_tax_template_9" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_normale" />
-            <field name="tax_dest_id" ref="tva_export_0" />
-        </record>
-<!-- 8,5% - - >
-    <record id="fiscal_position_tax_template_10" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_specifique" />
-            <field name="tax_dest_id" ref="tva_export_0" />
-        </record>
-<! - - 5,5% -->
-    <record id="fiscal_position_tax_template_11" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_reduite" />
-            <field name="tax_dest_id" ref="tva_export_0" />
-        </record>
-<!-- 2,1% - - >
-    <record id="fiscal_position_tax_template_12" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_super_reduite" />
-            <field name="tax_dest_id" ref="tva_export_0" />
-        </record>
--->
-
-<!-- Immobilisations -->
-<!-- achats -->
-<!-- 19,6% -->
-    <record id="fiscal_position_tax_template_5" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_acq_normale" />
-            <field name="tax_dest_id" ref="tva_imm_normale" />
-        </record>
-<!-- 8,5% - - >
-    <record id="fiscal_position_tax_template_6" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_acq_specifique" />
-            <field name="tax_dest_id" ref="tva_imm_specifique" />
-        </record>
-<! - - 5,5% -->
-    <record id="fiscal_position_tax_template_7" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_acq_reduite" />
-            <field name="tax_dest_id" ref="tva_imm_reduite" />
-        </record>
-<!-- 2,1% - - >
-    <record id="fiscal_position_tax_template_8" model="account.fiscal.position.tax.template">
-            <field name="position_id" ref="fiscal_position_template_2" />
-            <field name="tax_src_id" ref="tva_acq_super_reduite" />
-            <field name="tax_dest_id" ref="tva_imm_super_reduite" />
-        </record>
--->
-
-    <!-- = = = = = = = = = = = = = = = = = -->
-    <!-- Fiscal Position Account Templates -->
-    <!-- = = = = = = = = = = = = = = = = = -->
-
-<!-- Substitution des comptes de produits -->
-
-<!-- TVA sur Débits ou Encaissements Pr les 4 taux : 19,6% ; 8,5% ; 5,5% ; 2,1% - - >
-    <record id="fiscal_position_account_template_1" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_1"  />
-            <field name="account_src_id" ref="a7000" />
-            <field name="account_dest_id" ref="a_sale" />
-        </record>
-
-        <record id="fiscal_position_account_template_6" model="account.fiscal.position.account.template">
-            <field name="position_id" ref="fiscal_position_template_2"  />
-            <field name="account_src_id" ref="a7050" />
-            <field name="account_dest_id" ref="a7051" />
-        </record -->
-
-
-    </data>
-</openerp>    
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/fr_pcg_taxes.xml
new file mode 100644
index 00000000000..b44d04439f0
--- /dev/null
+++ b/addons/l10n_fr/fr_pcg_taxes.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    <!--
+        Définition des Tax Codes
+        Version du fichier : 07-05-2012
+      -->
+
+    <!--
+        Tax Code Configuration (version générique)
+      -->
+    <record id="vat_code_chart_root" model="account.tax.code.template">
+        <field name="name">Plan de Taxes France</field>
+    </record>
+
+    <record model="account.tax.code.template" id="tax_col_ht">
+      <field name="name">Base H.T. TVA collectée</field>
+      <field name="code">a)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_col_196_ht">
+      <field name="name">Base H.T. 19.6%</field>
+      <field name="code">TVA collectée 19.6% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_col_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col_85_ht">
+      <field name="name">Base H.T. 8.5%</field>
+      <field name="code">TVA collectée 8.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_col_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col_70_ht">
+      <field name="name">Base H.T. 7.0%</field>
+      <field name="code">TVA collectée 7.0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_col_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col_55_ht">
+      <field name="name">Base H.T. 5.5%</field>
+      <field name="code">TVA collectée 5.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_col_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col_21_ht">
+      <field name="name">Base H.T. 2.1%</field>
+      <field name="code">TVA collectée 2.1% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_col_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+
+    <record model="account.tax.code.template" id="tax_col">
+      <field name="name">TVA collectée</field>
+      <field name="code">b)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_col_196">
+      <field name="name">TVA 19.6%</field>
+      <field name="code">TVA collectée 19.6%</field>
+      <field name="parent_id" ref="tax_col"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col_85">
+      <field name="name">TVA 8.5%</field>
+      <field name="code">TVA collectée 8.5%</field>
+      <field name="parent_id" ref="tax_col"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col_70">
+      <field name="name">TVA 7.0%</field>
+      <field name="code">TVA collectée 7.0%</field>
+      <field name="parent_id" ref="tax_col"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col_55">
+      <field name="name">TVA 5.5%</field>
+      <field name="code">TVA collectée 5.5%</field>
+      <field name="parent_id" ref="tax_col"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_col_21">
+      <field name="name">TVA 2.1%</field>
+      <field name="code">TVA collectée 2.1%</field>
+      <field name="parent_id" ref="tax_col"/>
+      <field name="sign">1.00</field>
+    </record>
+
+
+
+    <record model="account.tax.code.template" id="tax_acq_ht">
+      <field name="name">Base H.T. TVA acquittée</field>
+      <field name="code">c)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_acq_196_ht">
+      <field name="name">Base H.T. 19.6%</field>
+      <field name="code">TVA acquittée 19.6% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_acq_85_ht">
+      <field name="name">Base H.T. 8.5%</field>
+      <field name="code">TVA acquittée 8.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_acq_70_ht">
+      <field name="name">Base H.T. 7.0%</field>
+      <field name="code">TVA acquittée 7.0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_acq_55_ht">
+      <field name="name">Base H.T. 5.5%</field>
+      <field name="code">TVA acquittée 5.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_acq_21_ht">
+      <field name="name">Base H.T. 2.1%</field>
+      <field name="code">TVA acquittée 2.1% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+
+    <record model="account.tax.code.template" id="tax_acq">
+      <field name="name">TVA acquittée</field>
+      <field name="code">d)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_acq_196">
+      <field name="name">TVA 19.6%</field>
+      <field name="code">TVA acquittée 19.6%</field>
+      <field name="parent_id" ref="tax_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_acq_85">
+      <field name="name">TVA 8.5%</field>
+      <field name="code">TVA acquittée 8.5%</field>
+      <field name="parent_id" ref="tax_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_acq_70">
+      <field name="name">TVA 7.0%</field>
+      <field name="code">TVA acquittée 7.0%</field>
+      <field name="parent_id" ref="tax_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_acq_55">
+      <field name="name">TVA 5.5%</field>
+      <field name="code">TVA acquittée 5.5%</field>
+      <field name="parent_id" ref="tax_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_acq_21">
+      <field name="name">TVA 2.1%</field>
+      <field name="code">TVA acquittée 2.1%</field>
+      <field name="parent_id" ref="tax_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+
+
+
+    <record model="account.tax.code.template" id="tax_imm_ht">
+      <field name="name">Base H.T. TVA acquittée pour immobilisations</field>
+      <field name="code">e)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_imm_196_ht">
+      <field name="name">Base H.T. 19.6%</field>
+      <field name="code">TVA acquittée sur immobilisations 19.6% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_imm_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_imm_85_ht">
+      <field name="name">Base H.T. 8.5%</field>
+      <field name="code">TVA acquittée sur immobilisations 8.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_imm_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_imm_70_ht">
+      <field name="name">Base H.T. 7.0%</field>
+      <field name="code">TVA acquittée sur immobilisations 7.0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_imm_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_imm_55_ht">
+      <field name="name">Base H.T. 5.5%</field>
+      <field name="code">TVA acquittée sur immobilisations 5.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_imm_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_imm_21_ht">
+      <field name="name">Base H.T. 2.1%</field>
+      <field name="code">TVA acquittée sur immobilisations 2.1% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_imm_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+
+
+    <record model="account.tax.code.template" id="tax_imm">
+      <field name="name">TVA acquittée pour immobilisations</field>
+      <field name="code">f)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_imm_196">
+      <field name="name">TVA 19.6%</field>
+      <field name="code">TVA acquittée sur immobilisations 19.6%</field>
+      <field name="parent_id" ref="tax_imm"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_imm_85">
+      <field name="name">TVA 8.5%</field>
+      <field name="code">TVA acquittée sur immobilisations 8.5%</field>
+      <field name="parent_id" ref="tax_imm"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_imm_70">
+      <field name="name">TVA 7.0%</field>
+      <field name="code">TVA acquittée sur immobilisations 7.0%</field>
+      <field name="parent_id" ref="tax_imm"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_imm_55">
+      <field name="name">TVA 5.5%</field>
+      <field name="code">TVA acquittée sur immobilisations 5.5%</field>
+      <field name="parent_id" ref="tax_imm"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_imm_21">
+      <field name="name">TVA 2.1%</field>
+      <field name="code">TVA acquittée sur immobilisations 2.1%</field>
+      <field name="parent_id" ref="tax_imm"/>
+      <field name="sign">1.00</field>
+    </record>
+
+    <record model="account.tax.code.template" id="tax_intra_ht">
+      <field name="name">Base H.T. TVA due intracommunautaire</field>
+      <field name="code">g)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_intra_196_ht">
+      <field name="name">Base H.T. 19.6%</field>
+      <field name="code">TVA due intracommunautaire 19.6% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_85_ht">
+      <field name="name">Base H.T. 8.5%</field>
+      <field name="code">TVA due intracommunautaire 8.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_70_ht">
+      <field name="name">Base H.T. 7.0%</field>
+      <field name="code">TVA due intracommunautaire 7.0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_55_ht">
+      <field name="name">Base H.T. 5.5%</field>
+      <field name="code">TVA due intracommunautaire 5.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_21_ht">
+      <field name="name">Base H.T. 2.1%</field>
+      <field name="code">TVA due intracommunautaire 2.1% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+
+    <record model="account.tax.code.template" id="tax_intra">
+      <field name="name">TVA due intracommunautaire</field>
+      <field name="code">h)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_intra_196">
+      <field name="name">TVA 19.6%</field>
+      <field name="code">TVA due intracommunautaire 19.6%</field>
+      <field name="parent_id" ref="tax_intra"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_85">
+      <field name="name">TVA 8.5%</field>
+      <field name="code">TVA due intracommunautaire 8.5%</field>
+      <field name="parent_id" ref="tax_intra"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_70">
+      <field name="name">TVA 7.0%</field>
+      <field name="code">TVA due intracommunautaire 7.0%</field>
+      <field name="parent_id" ref="tax_intra"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_55">
+      <field name="name">TVA 5.5%</field>
+      <field name="code">TVA due intracommunautaire 5.5%</field>
+      <field name="parent_id" ref="tax_intra"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_21">
+      <field name="name">TVA 2.1%</field>
+      <field name="code">TVA due intracommunautaire 2.1%</field>
+      <field name="parent_id" ref="tax_intra"/>
+      <field name="sign">1.00</field>
+    </record>
+
+
+    <record model="account.tax.code.template" id="tax_intra_acq_ht">
+      <field name="name">Base H.T. TVA déductible intracommunautaire</field>
+      <field name="code">i)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_intra_acq_196_ht">
+      <field name="name">Base H.T. 19.6%</field>
+      <field name="code">TVA déductible intracommunautaire 19.6% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_acq_85_ht">
+      <field name="name">Base H.T. 8.5%</field>
+      <field name="code">TVA déductible intracommunautaire 8.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_acq_70_ht">
+      <field name="name">Base H.T. 7.0%</field>
+      <field name="code">TVA déductible intracommunautaire 7.0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_acq_55_ht">
+      <field name="name">Base H.T. 5.5%</field>
+      <field name="code">TVA déductible intracommunautaire 5.5% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_acq_21_ht">
+      <field name="name">Base H.T. 2.1%</field>
+      <field name="code">TVA déductible intracommunautaire 2.1% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_intra_acq_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+
+    <record model="account.tax.code.template" id="tax_intra_acq">
+      <field name="name">TVA déductible intracommunautaire</field>
+      <field name="code">j)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record> 
+    <record model="account.tax.code.template" id="tax_intra_acq_196">
+      <field name="name">TVA 19.6%</field>
+      <field name="code">TVA déductible intracommunautaire 19.6%</field>
+      <field name="parent_id" ref="tax_intra_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_acq_85">
+      <field name="name">TVA 8.5%</field>
+      <field name="code">TVA déductible intracommunautaire 8.5%</field>
+      <field name="parent_id" ref="tax_intra_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_acq_70">
+      <field name="name">TVA 7.0%</field>
+      <field name="code">TVA déductible intracommunautaire 7.0%</field>
+      <field name="parent_id" ref="tax_intra_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_acq_55">
+      <field name="name">TVA 5.5%</field>
+      <field name="code">TVA déductible intracommunautaire 5.5%</field>
+      <field name="parent_id" ref="tax_intra_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_acq_21">
+      <field name="name">TVA 2.1%</field>
+      <field name="code">TVA déductible intracommunautaire 2.1%</field>
+      <field name="parent_id" ref="tax_intra_acq"/>
+      <field name="sign">1.00</field>
+    </record>
+
+    <record model="account.tax.code.template" id="tax_0_ht">
+      <field name="name">Base H.T. Opérations non imposables</field>
+      <field name="code">k)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record>
+    <record model="account.tax.code.template" id="tax_export_0_ht">
+      <field name="name">Exportations hors U.E.</field>
+      <field name="code">Exportations hors U.E. TVA 0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_0_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_intra_0_ht">
+      <field name="name">Livraisons intracommunautaires</field>
+      <field name="code">Livraisons intracommunautaires TVA 0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_0_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+    <record model="account.tax.code.template" id="tax_misc_0_ht">
+      <field name="name">Autres opérations non imposables</field>
+      <field name="code">Autres opérations non imposables TVA 0% (Base H.T.)</field>
+      <field name="parent_id" ref="tax_0_ht"/>
+      <field name="sign">1.00</field>
+    </record>
+
+
+    <record model="account.tax.code.template" id="non_present_sur_ca3">
+      <field name="name">Base H.T. Non présent sur la CA3</field>
+      <field name="code">Absent CA3)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="vat_code_chart_root"/>
+    </record>
+    <record model="account.tax.code.template" id="tax_import_0_ht">
+      <field name="name">Achats import</field>
+      <field name="code">Achats import TVA 0% (Base H.T.)</field>
+      <field name="sign">1.00</field>
+      <field name="parent_id" ref="non_present_sur_ca3"/>
+    </record>
+
+
+
+      <!-- Chart template -->
+         <record id="l10n_fr_pcg_chart_template" model="account.chart.template">
+            <field name="name">Plan Comptable Général (France)</field>
+            <field name="account_root_id" ref="pcg_0"/>
+            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
+            <field name="bank_account_view_id" ref="pcg_5121"/>
+            <field name="property_account_receivable" ref="fr_pcg_recv"/>
+            <field name="property_account_payable" ref="fr_pcg_pay"/>
+            <field name="property_account_expense_categ" ref="pcg_6071"/>
+            <field name="property_account_income_categ" ref="pcg_7071"/>
+            <field name="property_reserve_and_surplus_account" ref="pcg_120"/>
+        </record>
+
+  </data>
+</openerp>
diff --git a/addons/l10n_fr/fr_pcg_taxes_demo.xml b/addons/l10n_fr/fr_pcg_taxes_demo.xml
deleted file mode 100644
index 60d0a21844a..00000000000
--- a/addons/l10n_fr/fr_pcg_taxes_demo.xml
+++ /dev/null
@@ -1,1308 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-    <!--
-        Définition des taux de TVA et des Tax Codes
-        Version du fichier : 12-04-2008
-      -->
-
-    <!--
-        Tax Code Configuration (version générique)
-      -->
-        
-        <record id="vat_code_chart_root" model="account.tax.code.template">
-                <field name="name">Plan de Taxes France</field>
-    </record>
-        
-    <record model="account.tax.code.template" id="tax_col_ht">
-      <field name="name">Base H.T. TVA collectée</field>
-      <field name="code">a)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_col_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA collectée à 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_col_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_85_ht">
-      <field name="name">Base H.T. 8.5%</field>
-      <field name="code">TVA collectée à 8.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_col_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA collectée à 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_col_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_55_ht">
-      <field name="name">Base H.T. 5.5%</field>
-      <field name="code">TVA collectée à 5.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_col_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_21_ht">
-      <field name="name">Base H.T. 2.1%</field>
-      <field name="code">TVA collectée à 2.1% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_col_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-
-    <record model="account.tax.code.template" id="tax_col">
-      <field name="name">TVA collectée</field>
-      <field name="code">b)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_col_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA collectée à 19.6%</field>
-      <field name="parent_id" ref="tax_col"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_85">
-      <field name="name">TVA 8.5%</field>
-      <field name="code">TVA collectée à 8.5%</field>
-      <field name="parent_id" ref="tax_col"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA collectée à 7.0%</field>
-      <field name="parent_id" ref="tax_col"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_55">
-      <field name="name">TVA 5.5%</field>
-      <field name="code">TVA collectée à 5.5%</field>
-      <field name="parent_id" ref="tax_col"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_col_21">
-      <field name="name">TVA 2.1%</field>
-      <field name="code">TVA collectée à 2.1%</field>
-      <field name="parent_id" ref="tax_col"/>
-      <field name="sign">1.00</field>
-    </record>
-
-
-
-    <record model="account.tax.code.template" id="tax_acq_ht">
-      <field name="name">Base H.T. TVA acquittée</field>
-      <field name="code">c)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_acq_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA acquittée à 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_85_ht">
-      <field name="name">Base H.T. 8.5%</field>
-      <field name="code">TVA acquittée à 8.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA acquittée à 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_55_ht">
-      <field name="name">Base H.T. 5.5%</field>
-      <field name="code">TVA acquittée à 5.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_21_ht">
-      <field name="name">Base H.T. 2.1%</field>
-      <field name="code">TVA acquittée à 2.1% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-
-    <record model="account.tax.code.template" id="tax_acq">
-      <field name="name">TVA acquittée</field>
-      <field name="code">d)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_acq_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA acquittée à 19.6%</field>
-      <field name="parent_id" ref="tax_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_85">
-      <field name="name">TVA 8.5%</field>
-      <field name="code">TVA acquittée à 8.5%</field>
-      <field name="parent_id" ref="tax_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA acquittée à 7.0%</field>
-      <field name="parent_id" ref="tax_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_55">
-      <field name="name">TVA 5.5%</field>
-      <field name="code">TVA acquittée à 5.5%</field>
-      <field name="parent_id" ref="tax_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_acq_21">
-      <field name="name">TVA 2.1%</field>
-      <field name="code">TVA acquittée à 2.1%</field>
-      <field name="parent_id" ref="tax_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-
-
-
-    <record model="account.tax.code.template" id="tax_imm_ht">
-      <field name="name">Base H.T. TVA acquittée pour immobilisations</field>
-      <field name="code">e)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_imm_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA acquittée sur immobilisations à 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_imm_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_85_ht">
-      <field name="name">Base H.T. 8.5%</field>
-      <field name="code">TVA acquittée sur immobilisations à 8.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_imm_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA acquittée sur immobilisations à 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_imm_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_55_ht">
-      <field name="name">Base H.T. 5.5%</field>
-      <field name="code">TVA acquittée sur immobilisations à 5.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_imm_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_21_ht">
-      <field name="name">Base H.T. 2.1%</field>
-      <field name="code">TVA acquittée sur immobilisations à 2.1% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_imm_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-
-
-    <record model="account.tax.code.template" id="tax_imm">
-      <field name="name">TVA acquittée pour immobilisations</field>
-      <field name="code">f)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_imm_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA acquittée sur immobilisations à 19.6%</field>
-      <field name="parent_id" ref="tax_imm"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_85">
-      <field name="name">TVA 8.5%</field>
-      <field name="code">TVA acquittée sur immobilisations à 8.5%</field>
-      <field name="parent_id" ref="tax_imm"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA acquittée sur immobilisations à 7.0%</field>
-      <field name="parent_id" ref="tax_imm"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_55">
-      <field name="name">TVA 5.5%</field>
-      <field name="code">TVA acquittée sur immobilisations à 5.5%</field>
-      <field name="parent_id" ref="tax_imm"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_imm_21">
-      <field name="name">TVA 2.1%</field>
-      <field name="code">TVA acquittée sur immobilisations à 2.1%</field>
-      <field name="parent_id" ref="tax_imm"/>
-      <field name="sign">1.00</field>
-    </record>
-
-    <record model="account.tax.code.template" id="tax_intra_ht">
-      <field name="name">Base H.T. TVA due intracommunautaire</field>
-      <field name="code">g)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_intra_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA due intracommunautaire 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_85_ht">
-      <field name="name">Base H.T. 8.5%</field>
-      <field name="code">TVA due intracommunautaire 8.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA due intracommunautaire 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_55_ht">
-      <field name="name">Base H.T. 5.5%</field>
-      <field name="code">TVA due intracommunautaire 5.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_21_ht">
-      <field name="name">Base H.T. 2.1%</field>
-      <field name="code">TVA due intracommunautaire 2.1% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-
-    <record model="account.tax.code.template" id="tax_intra">
-      <field name="name">TVA due intracommunautaire</field>
-      <field name="code">h)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_intra_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA due intracommunautaire 19.6%</field>
-      <field name="parent_id" ref="tax_intra"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_85">
-      <field name="name">TVA 8.5%</field>
-      <field name="code">TVA due intracommunautaire 8.5%</field>
-      <field name="parent_id" ref="tax_intra"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA due intracommunautaire 7.0%</field>
-      <field name="parent_id" ref="tax_intra"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_55">
-      <field name="name">TVA 5.5%</field>
-      <field name="code">TVA due intracommunautaire 5.5%</field>
-      <field name="parent_id" ref="tax_intra"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_21">
-      <field name="name">TVA 2.1%</field>
-      <field name="code">TVA due intracommunautaire 2.1%</field>
-      <field name="parent_id" ref="tax_intra"/>
-      <field name="sign">1.00</field>
-    </record>
-
-
-    <record model="account.tax.code.template" id="tax_intra_acq_ht">
-      <field name="name">Base H.T. TVA déductible intracommunautaire</field>
-      <field name="code">i)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_intra_acq_196_ht">
-      <field name="name">Base H.T. 19.6%</field>
-      <field name="code">TVA déductible intracommunautaire 19.6% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_85_ht">
-      <field name="name">Base H.T. 8.5%</field>
-      <field name="code">TVA déductible intracommunautaire 8.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_70_ht">
-      <field name="name">Base H.T. 7.0%</field>
-      <field name="code">TVA déductible intracommunautaire 7.0% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_55_ht">
-      <field name="name">Base H.T. 5.5%</field>
-      <field name="code">TVA déductible intracommunautaire 5.5% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_21_ht">
-      <field name="name">Base H.T. 2.1%</field>
-      <field name="code">TVA déductible intracommunautaire 2.1% (Base H.T.)</field>
-      <field name="parent_id" ref="tax_intra_acq_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-
-    <record model="account.tax.code.template" id="tax_intra_acq">
-      <field name="name">TVA déductible intracommunautaire</field>
-      <field name="code">j)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_intra_acq_196">
-      <field name="name">TVA 19.6%</field>
-      <field name="code">TVA déductible intracommunautaire 19.6%</field>
-      <field name="parent_id" ref="tax_intra_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_85">
-      <field name="name">TVA 8.5%</field>
-      <field name="code">TVA déductible intracommunautaire 8.5%</field>
-      <field name="parent_id" ref="tax_intra_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_70">
-      <field name="name">TVA 7.0%</field>
-      <field name="code">TVA déductible intracommunautaire 7.0%</field>
-      <field name="parent_id" ref="tax_intra_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_55">
-      <field name="name">TVA 5.5%</field>
-      <field name="code">TVA déductible intracommunautaire 5.5%</field>
-      <field name="parent_id" ref="tax_intra_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_acq_21">
-      <field name="name">TVA 2.1%</field>
-      <field name="code">TVA déductible intracommunautaire 2.1%</field>
-      <field name="parent_id" ref="tax_intra_acq"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_0_ht">
-      <field name="name">Base H.T. Opérations non imposables</field>
-      <field name="code">k)</field>
-      <field name="sign">1.00</field>
-      <field name="parent_id" ref="vat_code_chart_root"/>
-    </record> 
-    <record model="account.tax.code.template" id="tax_export_0_ht">
-      <field name="name">Exportations hors C.E.</field>
-      <field name="code">Exportations hors C.E. TVA 0%</field>
-      <field name="parent_id" ref="tax_0_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_intra_0_ht">
-      <field name="name">Livraisons intracommunautaires</field>
-      <field name="code">Livraisons intracommunautaires TVA 0%</field>
-      <field name="parent_id" ref="tax_0_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-    <record model="account.tax.code.template" id="tax_misc_0_ht">
-      <field name="name">Autres oprérations non imposables</field>
-      <field name="code">Autres oprérations non imposables TVA 0%</field>
-      <field name="parent_id" ref="tax_0_ht"/>
-      <field name="sign">1.00</field>
-    </record>
-
-
-      <!-- Chart template -->
-         <record id="l10n_fr_pcg_chart_template" model="account.chart.template">
-            <field name="name">Plan Comptable Général (France)</field>
-            <field name="account_root_id" ref="pcg_0"/>
-            <field name="tax_code_root_id" ref="vat_code_chart_root"/>
-            <field name="bank_account_view_id" ref="pcg_5121"/>
-            <field name="property_account_receivable" ref="fr_pcg_recv"/>
-            <field name="property_account_payable" ref="fr_pcg_pay"/>
-            <field name="property_account_expense_categ" ref="pcg_6071"/>
-            <field name="property_account_income_categ" ref="pcg_7071"/>
-        </record>
-       
-      <!--
-        TVA
-      -->
-
-    <record model="account.tax.template" id="tva_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>                        
-      
-      <field name="name">TVA collectée (vente) 19,6%</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_196_ht"/>
-      <field name="tax_code_id" ref="tax_col_196"/>
-
-      <field name="ref_base_code_id" ref="tax_col_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-
-    </record>
-
-    <record model="account.tax.template" id="tva_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA collectée (vente) 8,5%</field>
-      <field name="amount" eval="0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_85_ht"/>
-      <field name="tax_code_id" ref="tax_col_85"/>
-
-      <field name="ref_base_code_id" ref="tax_col_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-    
-    <record model="account.tax.template" id="tva_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA collectée (vente) 7,0%</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_70_ht"/>
-      <field name="tax_code_id" ref="tax_col_70"/>
-
-      <field name="ref_base_code_id" ref="tax_col_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA collectée (vente) 5,5%</field>
-      <field name="amount" eval="0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_55_ht"/>
-      <field name="tax_code_id" ref="tax_col_55"/>
-
-      <field name="ref_base_code_id" ref="tax_col_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_super_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA collectée (vente) 2,1%</field>
-      <field name="amount" eval="0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_col_21_ht"/>
-      <field name="tax_code_id" ref="tax_col_21"/>
-
-      <field name="ref_base_code_id" ref="tax_col_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_col_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record> 
-
-    <record model="account.tax.template" id="tva_acq_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA acquittée (achat) 19,6%</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_196_ht"/>
-      <field name="tax_code_id" ref="tax_acq_196"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA acquittée (achat) 8,5%</field>
-      <field name="amount" eval="0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_85_ht"/>
-      <field name="tax_code_id" ref="tax_acq_85"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA acquittée (achat) 7,0%</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_70_ht"/>
-      <field name="tax_code_id" ref="tax_acq_70"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA acquittée (achat) 5,5%</field>
-      <field name="amount" eval="0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_55_ht"/>
-      <field name="tax_code_id" ref="tax_acq_55"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_super_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA acquittée (achat) 2,1%</field>
-      <field name="amount" eval="0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_acq_21_ht"/>
-      <field name="tax_code_id" ref="tax_acq_21"/>
-
-      <field name="ref_base_code_id" ref="tax_acq_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_acq_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record> 
-
-    <record model="account.tax.template" id="tva_imm_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA immobilisation (achat) 19,6%</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_196_ht"/>
-      <field name="tax_code_id" ref="tax_imm_196"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA immobilisation (achat) 8,5%</field>
-      <field name="amount" eval="0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_85_ht"/>
-      <field name="tax_code_id" ref="tax_imm_85"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA immobilisation (achat) 7,0%</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_70_ht"/>
-      <field name="tax_code_id" ref="tax_imm_70"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA immobilisation (achat) 5,5%</field>
-      <field name="amount" eval="0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_55_ht"/>
-      <field name="tax_code_id" ref="tax_imm_55"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_super_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA immobilisation (achat) 2,1%</field>
-      <field name="amount" eval="0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_imm_21_ht"/>
-      <field name="tax_code_id" ref="tax_imm_21"/>
-
-      <field name="ref_base_code_id" ref="tax_imm_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_imm_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA due intracommunautaire 19,6%</field>
-      <field name="amount" eval="-0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_196_ht"/>
-      <field name="tax_code_id" ref="tax_intra_196"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>        
-      
-      <field name="name">TVA due intracommunautaire 8,5%</field>
-      <field name="amount" eval="-0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_85_ht"/>
-      <field name="tax_code_id" ref="tax_intra_85"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA due intracommunautaire 7,0%</field>
-      <field name="amount" eval="-0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_70_ht"/>
-      <field name="tax_code_id" ref="tax_intra_70"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA due intracommunautaire 5,5%</field>
-      <field name="amount" eval="-0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_55_ht"/>
-      <field name="tax_code_id" ref="tax_intra_55"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_super_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA due intracommunautaire 2,1%</field>
-      <field name="amount" eval="-0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_21_ht"/>
-      <field name="tax_code_id" ref="tax_intra_21"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_normale">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA déductible intracommunautaire 19,6%</field>
-      <field name="amount" eval="0.196"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_196_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_196"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_specifique">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA déductible intracommunautaire 8,5%</field>
-      <field name="amount" eval="0.085"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_85_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_85"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_specifique_1">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-
-      <field name="name">TVA déductible intracommunautaire 7,0%</field>
-      <field name="amount" eval="0.07"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_70_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_70"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA déductible intracommunautaire 5,5%</field>
-      <field name="amount" eval="0.055"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_55_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_55"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_super_reduite">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA déductible intracommunautaire 2,1%</field>
-      <field name="amount" eval="0.021"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_acq_21_ht"/>
-      <field name="tax_code_id" ref="tax_intra_acq_21"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_acq_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-      <field name="ref_tax_code_id" ref="tax_intra_acq_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_0">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA 0%</field>
-      <field name="amount" eval="0.00"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_misc_0_ht"/>
-
-      <field name="ref_base_code_id" ref="tax_misc_0_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_export_0">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA exportation 0%</field>
-      <field name="amount" eval="0.00"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_export_0_ht"/>
-
-      <field name="ref_base_code_id" ref="tax_export_0_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_0">
-      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
-      
-      <field name="name">TVA livraisons intracommunautaires 0%</field>
-      <field name="amount" eval="0.00"/>
-      <field name="type">percent</field>
-      <field name="base_code_id" ref="tax_intra_0_ht"/>
-
-      <field name="ref_base_code_id" ref="tax_intra_0_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
-    </record>
-
-        <record id="pcg_601" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6011" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6012" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_602" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6021" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60211" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60212" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6022" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60221" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60222" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60223" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60224" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60225" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6026" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60261" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60265" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_60267" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_603" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6031" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6032" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6037" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_604" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_605" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_606" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6061" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6063" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6064" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6068" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="fr_pcg_expense" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6071" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6072" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_608" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_609" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6091" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6092" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6094" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6095" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6096" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6097" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6098" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_61" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_611" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_612" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6122" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6125" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_613" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6132" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6135" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6136" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_614" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_615" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6152" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6155" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6156" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6225" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6226" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6227" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6228" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_623" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6231" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6232" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6233" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6234" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6235" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6236" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6237" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6238" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_624" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6241" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6242" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6243" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6244" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6247" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_6248" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_acq_normale')])]"/>
-    </record>
-
-    <record id="pcg_7011" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7012" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_702" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_703" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_704" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7041" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7042" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_705" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_706" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="fr_pcg_sale" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7071" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-
-    <record id="pcg_7072" model="account.account.template">
-      <field name="tax_ids" eval="[(6,0,[ref('tva_normale')])]"/>
-    </record>
-    
-    <!-- TVA -->
-    <record model="account.tax.template" id="tva_normale">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_specifique">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_reduite">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_super_reduite">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_normale">
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_specifique">
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_reduite">
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_super_reduite">
-      <field name="account_collected_id" ref="pcg_44566"/>
-      <field name="account_paid_id" ref="pcg_44566"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_normale">
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_specifique">
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_reduite">
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_imm_super_reduite">
-      <field name="account_collected_id" ref="pcg_44562"/>
-      <field name="account_paid_id" ref="pcg_44562"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_normale">
-      <field name="account_collected_id" ref="pcg_4452"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_specifique">
-      <field name="account_collected_id" ref="pcg_4452"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_reduite">
-      <field name="account_collected_id" ref="pcg_4452"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_super_reduite">
-      <field name="account_collected_id" ref="pcg_4452"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_normale">
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_specifique">
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_reduite">
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_acq_intra_super_reduite">
-      <field name="account_collected_id" ref="pcg_445662"/>
-      <field name="account_paid_id" ref="pcg_445662"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_0">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_export_0">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-
-    <record model="account.tax.template" id="tva_intra_0">
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
-    </record>
-    
-  </data>
-</openerp>    
diff --git a/addons/l10n_fr/fr_report_demo.xml b/addons/l10n_fr/fr_report.xml
similarity index 100%
rename from addons/l10n_fr/fr_report_demo.xml
rename to addons/l10n_fr/fr_report.xml
diff --git a/addons/l10n_fr/fr_tax_demo.xml b/addons/l10n_fr/fr_tax.xml
similarity index 63%
rename from addons/l10n_fr/fr_tax_demo.xml
rename to addons/l10n_fr/fr_tax.xml
index d51d3874091..fc5d4608f45 100644
--- a/addons/l10n_fr/fr_tax_demo.xml
+++ b/addons/l10n_fr/fr_tax.xml
@@ -1,21 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
 
-    <!--
-    TVA :
-        France métropolitaine :  taux normal = 19,6%     Réduit = 5,5%
-        Département Outre Mer :                 8,5%                2,1%
-      -->
+<!-- Note : I set a sequence of 10 on all VAT taxes, because it is then
+     easier to create an eco-tax with a lower sequence (VAT applies on the
+     amount of the eco-tax)
+-->
 
-<!-- VENTES -->
+<!-- VENTES Tax excluded from price -->
     <record model="account.tax.template" id="tva_normale">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 19,6%</field>
-      <field name="description">1</field>   <!-- code -->
+      <field name="description">TVA-VT-19.6</field>
       <field name="amount" eval="0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_196_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_196"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445711"/>
       <field name="account_paid_id" ref="pcg_445711"/>
@@ -24,496 +26,737 @@
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_196"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_specifique">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 8,5%</field>
-      <field name="description">2</field>
+      <field name="description">TVA-VT-8.5</field>
       <field name="amount" eval="0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_85_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_85"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445713"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445713"/>
 
       <field name="ref_base_code_id" ref="tax_col_85_ht"/>
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_85"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_specifique_1">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 7,0%</field>
-      <field name="description">24</field>
+      <field name="description">TVA-VT-7.0</field>
       <field name="amount" eval="0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_70_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_70"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445713"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445713"/>
 
       <field name="ref_base_code_id" ref="tax_col_70_ht"/>
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_70"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 5,5%</field>
-      <field name="description">3</field>
+      <field name="description">TVA-VT-5.5</field>
       <field name="amount" eval="0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_55_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_55"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445712"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445712"/>
 
       <field name="ref_base_code_id" ref="tax_col_55_ht"/>
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_55"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_super_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA collectée (vente) 2,1%</field>
-      <field name="description">4</field>
+      <field name="description">TVA-VT-2.1</field>
       <field name="amount" eval="0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_col_21_ht"/>
+      <field name="base_sign" eval="1"/>
       <field name="tax_code_id" ref="tax_col_21"/>
+      <field name="tax_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_445713"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_paid_id" ref="pcg_445713"/>
 
       <field name="ref_base_code_id" ref="tax_col_21_ht"/>
       <field name="ref_base_sign" eval="-1"/>
       <field name="ref_tax_code_id" ref="tax_col_21"/>
       <field name="ref_tax_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
 
-<!-- ACHATS -->
+<!-- ACHATS Tax excluded from price -->
     <record model="account.tax.template" id="tva_acq_normale">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 19,6%</field>
-      <field name="description">5</field>
+      <field name="description">TVA-HA-19.6</field>
       <field name="amount" eval="0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_196_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_196"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_specifique">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 8,5%</field>
-      <field name="description">6</field>
+      <field name="description">TVA-HA-8.5</field>
       <field name="amount" eval="0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_85_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_85"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/> 
 
       <field name="ref_base_code_id" ref="tax_acq_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_specifique_1">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 7,0%</field>
-      <field name="description">25</field>
+      <field name="description">TVA-HA-7.0</field>
       <field name="amount" eval="0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_70_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_70"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 5,5%</field>
-      <field name="description">7</field>
+      <field name="description">TVA-HA-5.5</field>
       <field name="amount" eval="0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_55_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_55"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_super_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA acquittée (achat) 2,1%</field>
-      <field name="description">8</field>
+      <field name="description">TVA-HA-2.1</field>
       <field name="amount" eval="0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_acq_21_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_acq_21"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44566"/>
       <field name="account_paid_id" ref="pcg_44566"/>
 
       <field name="ref_base_code_id" ref="tax_acq_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_acq_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
-    </record> 
+    </record>
+
+
+<!-- ACHATS Tax included in price -->
+    <record model="account.tax.template" id="tva_acq_normale_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 19,6% inclue</field>
+      <field name="description">TVA-HA-19.6-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.196"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_196_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_196"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
+
+      <field name="ref_base_code_id" ref="tax_acq_196_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_196"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
+    <record model="account.tax.template" id="tva_acq_specifique_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 8,5% inclue</field>
+      <field name="description">TVA-HA-8.5-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.085"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_85_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_85"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/> 
+
+      <field name="ref_base_code_id" ref="tax_acq_85_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_85"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
+    <record model="account.tax.template" id="tva_acq_specifique_1_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 7,0% inclue</field>
+      <field name="description">TVA-HA-7.0-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.07"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_70_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_70"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
+
+      <field name="ref_base_code_id" ref="tax_acq_70_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_70"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
+    <record model="account.tax.template" id="tva_acq_reduite_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 5,5% inclue</field>
+      <field name="description">TVA-HA-5.5-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.055"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_55_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_55"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
+
+      <field name="ref_base_code_id" ref="tax_acq_55_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_55"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
+    <record model="account.tax.template" id="tva_acq_super_reduite_inclue">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA acquittée (achat) 2,1% inclue</field>
+      <field name="description">TVA-HA-2.1-inclue</field>
+      <field name="price_include" eval="1"/>
+      <field name="amount" eval="0.021"/>
+      <field name="type">percent</field>
+      <field name="base_code_id" ref="tax_acq_21_ht"/>
+      <field name="base_sign" eval="-1"/>
+      <field name="tax_code_id" ref="tax_acq_21"/>
+      <field name="tax_sign" eval="-1"/>
+
+      <field name="account_collected_id" ref="pcg_44566"/>
+      <field name="account_paid_id" ref="pcg_44566"/>
+
+      <field name="ref_base_code_id" ref="tax_acq_21_ht"/>
+      <field name="ref_base_sign" eval="1"/>
+      <field name="ref_tax_code_id" ref="tax_acq_21"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
+    </record>
+
 
 
 <!-- IMMOBILISATIONS (achats) -->
     <record model="account.tax.template" id="tva_imm_normale">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 19,6%</field>
-      <field name="description">9</field>
+      <field name="description">TVA-immo-19.6</field>
       <field name="amount" eval="0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_196_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_196"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_imm_specifique">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 8,5%</field>
-      <field name="description">10</field>
+      <field name="description">TVA-immo-8.5</field>
       <field name="amount" eval="0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_85_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_85"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_imm_specifique_1">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 7,0%</field>
-      <field name="description">26</field>
+      <field name="description">TVA-immo-7.0</field>
       <field name="amount" eval="0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_70_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_70"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_imm_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 5,5%</field>
-      <field name="description">11</field>
+      <field name="description">TVA-immo-5.5</field>
       <field name="amount" eval="0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_55_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_55"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_imm_super_reduite">
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
       <field name="name">TVA immobilisation (achat) 2,1%</field>
-      <field name="description">12</field>
+      <field name="description">TVA-immo-2.1</field>
       <field name="amount" eval="0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_imm_21_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_imm_21"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_44562"/>
       <field name="account_paid_id" ref="pcg_44562"/>
 
       <field name="ref_base_code_id" ref="tax_imm_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_imm_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
 
 <!-- VENTES INTRACOMMUNAUTAIRE -->
     <record model="account.tax.template" id="tva_intra_normale">
-      <field name="name">TVA due intracommunautaire 19,6%</field>   <!-- ventes -->
-      <field name="description">13</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 19,6%</field>   <!-- ventes -->
+      <field name="description">TVA-HA_UE_due-19.6</field>
       <field name="amount" eval="-0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_196_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_196"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445201"/>
-      <field name="account_paid_id" ref="pcg_4452"/>      
+      <field name="account_paid_id" ref="pcg_445201"/>
 
       <field name="ref_base_code_id" ref="tax_intra_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_specifique">
-      <field name="name">TVA due intracommunautaire 8,5%</field>
-      <field name="description">14</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 8,5%</field>
+      <field name="description">TVA-HA_UE_due-8.5</field>
       <field name="amount" eval="-0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_85_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_85"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445203"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
+      <field name="account_paid_id" ref="pcg_445203"/>
 
       <field name="ref_base_code_id" ref="tax_intra_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_specifique_1">
-      <field name="name">TVA due intracommunautaire 7,0%</field>
-      <field name="description">27</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 7,0%</field>
+      <field name="description">TVA-HA_UE_due-7.0</field>
       <field name="amount" eval="-0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_70_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_70"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445203"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
+      <field name="account_paid_id" ref="pcg_445203"/>
 
       <field name="ref_base_code_id" ref="tax_intra_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_reduite">
-      <field name="name">TVA due intracommunautaire 5,5%</field>
-      <field name="description">15</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 5,5%</field>
+      <field name="description">TVA-HA_UE_due-5.5</field>
       <field name="amount" eval="-0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_55_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_55"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445202"/>
-      <field name="account_paid_id" ref="pcg_4452"/>
+      <field name="account_paid_id" ref="pcg_445202"/>
 
       <field name="ref_base_code_id" ref="tax_intra_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_super_reduite">
-      <field name="name">TVA due intracommunautaire 2,1%</field>
-      <field name="description">16</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA due intracommunautaire (achat) 2,1%</field>
+      <field name="description">TVA-HA_UE_due-2.1</field>
       <field name="amount" eval="-0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_21_ht"/>
+      <field name="base_sign" eval="-1" />
       <field name="tax_code_id" ref="tax_intra_21"/>
+      <field name="tax_sign" eval="-1" />
 
       <field name="account_collected_id" ref="pcg_445203"/>
-      <field name="account_paid_id" ref="pcg_4452"/>      
+      <field name="account_paid_id" ref="pcg_445203"/>
 
       <field name="ref_base_code_id" ref="tax_intra_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
-      <field name="type_tax_use">sale</field>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">purchase</field>
     </record>
 
 
 <!-- ACHATS INTRACOMMUNAUTAIRE -->
     <record model="account.tax.template" id="tva_acq_intra_normale">
-      <field name="name">TVA déductible intracommunautaire 19,6%</field>
-      <field name="description">17</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 19,6%</field>
+      <field name="description">TVA-HA_UE_déduc-19.6</field>
       <field name="amount" eval="0.196"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_196_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_196"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_196_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_196"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_intra_specifique">
-      <field name="name">TVA déductible intracommunautaire 8,5%</field>
-      <field name="description">18</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 8,5%</field>
+      <field name="description">TVA-HA_UE_déduc-8.5</field>
       <field name="amount" eval="0.085"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_85_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_85"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_85_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_85"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_intra_specifique_1">
-      <field name="name">TVA déductible intracommunautaire 7,0%</field>
-      <field name="description">28</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 7,0%</field>
+      <field name="description">TVA-HA_UE_déduc-7.0</field>
       <field name="amount" eval="0.07"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_70_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_70"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_70_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_70"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_intra_reduite">
-      <field name="name">TVA déductible intracommunautaire 5,5%</field>
-      <field name="description">19</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 5,5%</field>
+      <field name="description">TVA-HA_UE_déduc-5.5</field>
       <field name="amount" eval="0.055"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_55_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_55"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_55_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_55"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
     <record model="account.tax.template" id="tva_acq_intra_super_reduite">
-      <field name="name">TVA déductible intracommunautaire 2,1%</field>
-      <field name="description">20</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA déductible intracommunautaire (achat) 2,1%</field>
+      <field name="description">TVA-HA_UE_déduc-2.1</field>
       <field name="amount" eval="0.021"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_acq_21_ht"/>
+      <field name="base_sign" eval="-1"/>
       <field name="tax_code_id" ref="tax_intra_acq_21"/>
+      <field name="tax_sign" eval="-1"/>
 
       <field name="account_collected_id" ref="pcg_445662"/>
       <field name="account_paid_id" ref="pcg_445662"/>
 
       <field name="ref_base_code_id" ref="tax_intra_acq_21_ht"/>
-      <field name="ref_base_sign" eval="-1"/>
+      <field name="ref_base_sign" eval="1"/>
       <field name="ref_tax_code_id" ref="tax_intra_acq_21"/>
-      <field name="ref_tax_sign" eval="-1"/>
+      <field name="ref_tax_sign" eval="1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">purchase</field>
     </record>
 
 
 <!-- AUTRE -->
     <record model="account.tax.template" id="tva_0">
-      <field name="name">TVA 0%</field>
-      <field name="description">21</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA 0% autres opérations non imposables (vente)</field>
+      <field name="description">TVA-VT-autre-0</field>
       <field name="amount" eval="0.00"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_misc_0_ht"/>
+      <field name="base_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_44571"/>
       <field name="account_paid_id" ref="pcg_44571"/>
 
       <field name="ref_base_code_id" ref="tax_misc_0_ht"/>
       <field name="ref_base_sign" eval="-1"/>
-      <field name="type_tax_use">purchase</field>
+      <field name="sequence" eval="10"/>
+      <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_export_0">
-      <field name="name">TVA 0% exportation</field>
-      <field name="description">22</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA 0% export (vente)</field>
+      <field name="description">TVA-export-0</field>
       <field name="amount" eval="0.00"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_export_0_ht"/>
+      <field name="base_sign" eval="1"/>
 
       <field name="account_collected_id" ref="pcg_44571"/>
       <field name="account_paid_id" ref="pcg_44571"/>
 
       <field name="ref_base_code_id" ref="tax_export_0_ht"/>
       <field name="ref_base_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
     <record model="account.tax.template" id="tva_intra_0">
-      <field name="name">TVA 0% livraisons intracommunautaires</field>
-      <field name="description">23</field>
+      <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+      <field name="name">TVA 0% livraisons intracommunautaires (vente)</field>
+      <field name="description">TVA-VT-UE-0</field>
       <field name="amount" eval="0.00"/>
       <field name="type">percent</field>
       <field name="base_code_id" ref="tax_intra_0_ht"/>
+      <field name="base_sign" eval="1"/>
 
-      <field name="account_collected_id" ref="pcg_44571"/>
-      <field name="account_paid_id" ref="pcg_44571"/>
+      <field name="account_collected_id" ref="pcg_445201"/>
+      <field name="account_paid_id" ref="pcg_445201"/>
 
       <field name="ref_base_code_id" ref="tax_intra_0_ht"/>
       <field name="ref_base_sign" eval="-1"/>
+      <field name="sequence" eval="10"/>
       <field name="type_tax_use">sale</field>
     </record>
 
+    <record model="account.tax.template" id="tva_import_0">
+        <field name="chart_template_id" ref="l10n_fr_pcg_chart_template"/>
+        <field name="name">TVA 0% import (achat)</field>
+        <field name="description">TVA-import-0</field>
+        <field name="amount" eval="0.00"/>
+        <field name="type">percent</field>
+        <field name="base_code_id" ref="tax_import_0_ht"/>
+        <field name="base_sign" eval="-1"/>
+
+        <field name="account_collected_id" ref="pcg_44566"/>
+        <field name="account_paid_id" ref="pcg_44566"/>
+
+        <field name="ref_base_code_id" ref="tax_import_0_ht"/>
+        <field name="ref_base_sign" eval="1"/>
+        <field name="sequence" eval="10"/>
+        <field name="type_tax_use">purchase</field>
+    </record>
 
 <!--
     Comptes sur lesquels les taxes s'appliquent par défaut
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/l10n_fr.py
index 573f4f7519e..5efb4244306 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/l10n_fr.py
@@ -51,4 +51,17 @@ class l10n_fr_line(osv.osv):
 
 l10n_fr_line()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+class res_company(osv.osv):
+    _inherit = 'res.company'
+
+    _columns = {
+        'siret': fields.char('SIRET', size=64),
+        'ape': fields.char('APE', size=64),
+    }
+
+res_company()
+
+
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr/l10n_fr_view.xml b/addons/l10n_fr/l10n_fr_view.xml
new file mode 100755
index 00000000000..793cb7de813
--- /dev/null
+++ b/addons/l10n_fr/l10n_fr_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="res_company_form_l10n_fr" model="ir.ui.view">
+            <field name="name">res.company.form.l10n.fr</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//field[@name='company_registry']" position="after">
+                    <field name="siret"/>
+                    <field name="ape"/>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+       
+    </data>
+</openerp>
diff --git a/addons/l10n_fr/l10n_fr_wizard.xml b/addons/l10n_fr/l10n_fr_wizard.xml
index 2f4ab7d932a..073396ad28b 100644
--- a/addons/l10n_fr/l10n_fr_wizard.xml
+++ b/addons/l10n_fr/l10n_fr_wizard.xml
@@ -1,6 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
+    <!-- This ir.actions.todo triggers the screen "Generate your chart of account
+     from a chart template" in the install wizard of the l10n_fr module -->
     <record id="config_call_account_template_fr" model="ir.actions.todo">
         <field name="action_id" ref="account.action_wizard_multi_chart"/>
         <field name="type">automatic</field>
diff --git a/addons/l10n_fr/plan_comptable_general_demo.xml b/addons/l10n_fr/plan_comptable_general.xml
similarity index 97%
rename from addons/l10n_fr/plan_comptable_general_demo.xml
rename to addons/l10n_fr/plan_comptable_general.xml
index b78e1821720..9d16f44252b 100644
--- a/addons/l10n_fr/plan_comptable_general_demo.xml
+++ b/addons/l10n_fr/plan_comptable_general.xml
@@ -4210,7 +4210,7 @@
     <record id="pcg_44566" model="account.account.template">
       <field name="name">TVA sur autres biens et services</field>
       <field name="code">44566</field>
-      <field name="type">view</field>
+      <field name="type">other</field>
       <field name="user_type" ref="account_type_tax"/>
 
       <field name="parent_id" ref="pcg_4456"/>
@@ -4223,7 +4223,7 @@
       <field name="type">other</field>
       <field name="user_type" ref="account_type_tax"/>
 
-      <field name="parent_id" ref="pcg_44566"/>
+      <field name="parent_id" ref="pcg_4456"/>
       <field name="reconcile" eval="True"/>
     </record>
 
@@ -9042,212 +9042,5 @@
       <field name="parent_id" ref="pcg_79"/>
     </record>
 
-    <record id="pcg_Classe_8" model="account.account.template">
-      <field name="name">Comptes spéciaux</field>
-      <field name="code">Classes 8</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_0"/>
-    </record>
-
-    <record id="pcg_80" model="account.account.template">
-      <field name="name">Engagements</field>
-      <field name="code">80</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_Classe_8"/>
-    </record>
-
-    <record id="pcg_801" model="account.account.template">
-      <field name="name">Engagements donnés par l'entité</field>
-      <field name="code">801</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_80"/>
-    </record>
-
-    <record id="pcg_8011" model="account.account.template">
-      <field name="name">Avals, cautions, garanties</field>
-      <field name="code">8011</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_801"/>
-    </record>
-
-    <record id="pcg_8014" model="account.account.template">
-      <field name="name">Effets circulant sous l'endos de l'entité</field>
-      <field name="code">8014</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_801"/>
-    </record>
-
-    <record id="pcg_8016" model="account.account.template">
-      <field name="name">Redevances crédit-bail restant à courir</field>
-      <field name="code">8016</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_801"/>
-    </record>
-
-    <record id="pcg_80161" model="account.account.template">
-      <field name="name">Crédit-bail mobilier</field>
-      <field name="code">80161</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_8016"/>
-    </record>
-
-    <record id="pcg_80165" model="account.account.template">
-      <field name="name">Crédit-bail immobilier</field>
-      <field name="code">80165</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_8016"/>
-    </record>
-
-    <record id="pcg_8018" model="account.account.template">
-      <field name="name">Autres engagements donnés</field>
-      <field name="code">8018</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_801"/>
-    </record>
-
-    <record id="pcg_802" model="account.account.template">
-      <field name="name">Engagements reçus par l'entité</field>
-      <field name="code">802</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_80"/>
-    </record>
-
-    <record id="pcg_8021" model="account.account.template">
-      <field name="name">Avals, cautions, garanties</field>
-      <field name="code">8021</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_802"/>
-    </record>
-
-    <record id="pcg_8024" model="account.account.template">
-      <field name="name">Créances escomptées non échues</field>
-      <field name="code">8024</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_802"/>
-    </record>
-
-    <record id="pcg_8026" model="account.account.template">
-      <field name="name">Engagements reçus pour utilisation en crédit-bail</field>
-      <field name="code">8026</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_802"/>
-    </record>
-
-    <record id="pcg_80261" model="account.account.template">
-      <field name="name">Crédit-bail mobilier</field>
-      <field name="code">80261</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_8026"/>
-    </record>
-
-    <record id="pcg_80265" model="account.account.template">
-      <field name="name">Crédit-bail immobilier</field>
-      <field name="code">80265</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_8026"/>
-    </record>
-
-    <record id="pcg_8028" model="account.account.template">
-      <field name="name">Autres engagements reçus</field>
-      <field name="code">8028</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_802"/>
-    </record>
-
-    <record id="pcg_809" model="account.account.template">
-      <field name="name">Contrepartie des engagements</field>
-      <field name="code">809</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_80"/>
-    </record>
-
-    <record id="pcg_8091" model="account.account.template">
-      <field name="name">Contrepartie 801</field>
-      <field name="code">8091</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_809"/>
-    </record>
-
-    <record id="pcg_8092" model="account.account.template">
-      <field name="name">Contrepartie 802</field>
-      <field name="code">8092</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_commitment"/>
-
-      <field name="parent_id" ref="pcg_809"/>
-    </record>
-
-    <record id="pcg_88" model="account.account.template">
-      <field name="name">Résultats en instance d'affectation</field>
-      <field name="code">88</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_Classe_8"/>
-    </record>
-
-    <record id="pcg_89" model="account.account.template">
-      <field name="name">Bilan</field>
-      <field name="code">89</field>
-      <field name="type">view</field>
-      <field name="user_type" ref="account_type_view"/>
-
-      <field name="parent_id" ref="pcg_Classe_8"/>
-    </record>
-
-    <record id="pcg_890" model="account.account.template">
-      <field name="name">Bilan d'ouverture</field>
-      <field name="code">890</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_special"/>
-
-      <field name="parent_id" ref="pcg_89"/>
-    </record>
-
-    <record id="pcg_891" model="account.account.template">
-      <field name="name">Bilan de clôture</field>
-      <field name="code">891</field>
-      <field name="type">other</field>
-      <field name="user_type" ref="account_type_special"/>
-
-      <field name="parent_id" ref="pcg_89"/>
-    </record>
-
   </data>
 </openerp>
diff --git a/addons/l10n_fr_hr_payroll/__init__.py b/addons/l10n_fr_hr_payroll/__init__.py
new file mode 100755
index 00000000000..f7fcefd3c4b
--- /dev/null
+++ b/addons/l10n_fr_hr_payroll/__init__.py
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>
+#
+##############################################################################
+import l10n_fr_hr_payroll
+import report
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py
new file mode 100755
index 00000000000..b9bc3b74f22
--- /dev/null
+++ b/addons/l10n_fr_hr_payroll/__openerp__.py
@@ -0,0 +1,51 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'French Payroll',
+    'category': 'Localization/Payroll',
+    'author': 'Yannick Buron (SYNERPGY)',
+    'depends': ['hr_payroll', 'l10n_fr'],
+    'version': '1.0',
+    'description': """
+French Payroll Rules
+=======================
+
+    -Configuration of hr_payroll for french localization
+	-All main contributions rules for french payslip, for 'cadre' and 'non-cadre'
+	-New payslip report	
+
+    TODO :
+    -Integration with holidays module for deduction and allowance
+    -Integration with hr_payroll_account for the automatic account_move_line creation from the payslip
+    -Continue to integrate the contribution. Only the main contribution are currently implemented
+    -Remake the report under webkit
+    -The payslip.line with appears_in_payslip = False should appears in the payslip interface, but not in the payslip report
+    """,
+
+    'active': False,
+    'update_xml':[
+     'l10n_fr_hr_payroll_view.xml',
+     'l10n_fr_hr_payroll_data.xml',
+    ],
+    'installable': True
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
new file mode 100755
index 00000000000..8b08bc2385d
--- /dev/null
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll.py
@@ -0,0 +1,57 @@
+#-*- coding:utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011 OpenERP SA (<http://openerp.com>). All Rights Reserved
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import decimal_precision as dp
+
+
+class res_company(osv.osv):
+    _inherit = 'res.company'
+
+    _columns = {
+        'plafond_secu': fields.float('Plafond de la Securite Sociale', digits_compute=dp.get_precision('Payroll')),
+        'nombre_employes': fields.integer('Nombre d\'employes'),
+        'cotisation_prevoyance': fields.float('Cotisation Patronale Prevoyance', digits_compute=dp.get_precision('Payroll')),
+        'org_ss': fields.char('Organisme de securite sociale', size=64),
+        'conv_coll': fields.char('Convention collective', size=64),
+    }
+
+res_company()
+
+class hr_contract(osv.osv):
+    _inherit = 'hr.contract'
+
+    _columns = {
+        'qualif': fields.char('Qualification', size=64),
+        'niveau': fields.char('Niveau', size=64),
+        'coef': fields.char('Coefficient', size=64),
+    }
+hr_contract()
+
+class hr_payslip(osv.osv):
+    _inherit = 'hr.payslip'
+
+    _columns = {
+        'payment_mode': fields.char('Mode de paiement', size=64),
+    }
+hr_payslip()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml
new file mode 100755
index 00000000000..31d3ebe9654
--- /dev/null
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_data.xml
@@ -0,0 +1,1264 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+<!-- Concernant la codification des contributions, si quelqu'un sait où trouver une codification officielle on migrera dessus. En attendant les code des cotisations sont mis au hasard -->
+
+
+
+<!-- Holidays Category -->
+
+    <record model="hr.holidays.status" id="holiday_status_heures_sup">
+      <field name="name">Heures Supplementaires</field>
+      <field name="limit">True</field>
+      <field name="color_name">lightblue</field>
+    </record>
+
+
+
+
+
+<!--   Rule Category -->
+
+    <record id="base.main_company" model="res.company">
+        <field name="plafond_secu">2946</field>
+    </record>
+
+
+    <record id="TOTAL" model="hr.salary.rule.category">
+        <field name="name">Cout total pour l'entreprise</field>
+        <field name="code">TOTAL</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+    <record id="hr_payroll.NET" model="hr.salary.rule.category">
+        <field name="name">Salaire Net</field>
+        <field name="code">NET</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+    <record id="hr_payroll.GROSS" model="hr.salary.rule.category">
+        <field name="name">Salaire Brut</field>
+        <field name="code">BRUT</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+    <record id="hr_payroll.BASIC" model="hr.salary.rule.category">
+        <field name="name">Salaire de base</field>
+        <field name="code">BASE</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+    <record id="hr_payroll.ALW" model="hr.salary.rule.category">
+        <field name="name">Indemnite</field>
+        <field name="code">INDM</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+    <record id="hr_payroll.DED" model="hr.salary.rule.category">
+        <field name="name">Deduction</field>
+        <field name="code">DED</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+    <record id="C_IMP" model="hr.salary.rule.category">
+        <field name="name">Cumul Imposable</field>
+        <field name="code">C_IMP</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+    <record id="RETENUES" model="hr.salary.rule.category">
+        <field name="name">Total Retenues</field>
+        <field name="code">RETENUES</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+	
+    <record id="SALC" model="hr.salary.rule.category">
+        <field name="name">Total Charges Salariales</field>
+        <field name="code">SALC</field>
+        <field name="parent_id" ref="RETENUES"/>
+    </record>
+
+    <record id="hr_payroll.COMP" model="hr.salary.rule.category">
+        <field name="name">Cotisations Patronales</field>
+        <field name="code">COMP</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+    <record id="PREV" model="hr.salary.rule.category">
+        <field name="name">Cotisations Prevoyance Patronales</field>
+        <field name="code">PREV</field>
+        <field name="parent_id" ref="hr_payroll.COMP"/>
+    </record>
+
+    <record id="SECU" model="hr.salary.rule.category">
+        <field name="name">Plafond de Securite Sociale</field>
+        <field name="code">SECU</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+
+    <record id="other_totals" model="hr.salary.rule.category">
+        <field name="name">Autres totaux</field>
+        <field name="code">O_TOTALS</field>
+        <field name="parent_id" eval="False"/>
+    </record>
+
+
+
+
+        <!-- Contribution Register -->
+
+    <record id="hr_urssaf_register" model="hr.contribution.register">
+        <field name="name">URSSAF</field>
+    </record>
+
+    <record id="hr_retraite_register" model="hr.contribution.register">
+        <field name="name">Organisme de retraite complementaire</field>
+    </record>
+
+    <record id="hr_cci_register" model="hr.contribution.register">
+        <field name="name">Chambre du commerce et de l'industrie</field>
+    </record>
+
+    <record id="hr_prevoyance_register" model="hr.contribution.register">
+        <field name="name">Organisme de prevoyance</field>
+    </record>
+
+
+<!-- HR SALARY RULES-->
+
+
+
+    <record id="hr_payroll.hr_rule_basic" model="hr.salary.rule">
+        <field name="name">Salaire de base</field>
+        <field name="code">BASE</field>
+        <field name="sequence">1</field>
+    </record>
+
+    <record id="hr_payroll.hr_rule_taxable" model="hr.salary.rule">
+        <field name="name">Salaire Brut</field>
+            <field name="code">BRUT</field>
+        <field name="sequence">1000</field>
+        <field name="category_id" ref="hr_payroll.GROSS"/>
+        <field name="amount_python_compute">result = categories.BASE + categories.INDM - categories.DED</field>
+
+    </record>
+
+    <record id="hr_rule_secu" model="hr.salary.rule">
+        <field name="name">Plafond Securite Sociale</field>
+        <field name="code">SECU</field>
+        <field name="sequence">1010</field>
+        <field name="category_id" ref="SECU"/>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = contract.employee_id.company_id.plafond_secu</field>
+    </record>
+
+    <record id="hr_rule_tranche_a" model="hr.salary.rule">
+        <field name="name">Plafond Tranche A</field>
+        <field name="code">TA</field>
+        <field name="sequence">1011</field>
+        <field name="category_id" ref="other_totals"/>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = SECU</field>
+    </record>
+
+    <record id="hr_rule_tranche_b" model="hr.salary.rule">
+        <field name="name">Plafond Tranche B</field>
+        <field name="code">TB</field>
+        <field name="sequence">1012</field>
+        <field name="category_id" ref="other_totals"/>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = SECU * 4</field>
+    </record>
+
+    <record id="hr_rule_tranche_c" model="hr.salary.rule">
+        <field name="name">Plafond Tranche C</field>
+        <field name="code">TC</field>
+        <field name="sequence">1013</field>
+        <field name="category_id" ref="other_totals"/>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = SECU * 8</field>
+    </record>
+
+    <record id="hr_rule_tranche_1" model="hr.salary.rule">
+        <field name="name">Plafond Tranche 1</field>
+        <field name="code">T1</field>
+        <field name="sequence">1014</field>
+        <field name="category_id" ref="other_totals"/>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = SECU</field>
+    </record>
+
+    <record id="hr_rule_tranche_2" model="hr.salary.rule">
+        <field name="name">Plafond Tranche 2</field>
+        <field name="code">T2</field>
+        <field name="sequence">1015</field>
+        <field name="category_id" ref="other_totals"/>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = SECU * 3</field>
+    </record>
+
+
+    <record id="hr_rule_total_charges_salariales" model="hr.salary.rule">
+        <field name="name">Total des charges salariales</field>
+        <field name="sequence">2510</field>
+        <field name="code">SALC</field>
+        <field name="category_id" ref="other_totals"/>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = categories.SALC</field>
+    </record>
+
+
+    <record id="hr_rule_total_retenues" model="hr.salary.rule">
+        <field name="name">Total Retenues</field>
+        <field name="sequence">99999</field>
+        <field name="category_id" ref="other_totals"/>
+        <field name="code">RET</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="amount_python_compute">result = categories.RETENUES</field>
+    </record>
+
+    <record id="hr_rule_cumul_imposable" model="hr.salary.rule">
+        <field name="name">Cumul Imposable</field>
+        <field name="sequence">99999</field>
+        <field name="category_id" ref="C_IMP"/>
+        <field name="code">C_IMP</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="amount_python_compute">result = BRUT - categories.SALC</field>
+    </record>
+
+
+    <record id="hr_payroll.hr_rule_net" model="hr.salary.rule">
+        <field name="name">Net</field>
+        <field name="sequence">100000</field>
+        <field name="category_id" ref="hr_payroll.NET"/>
+        <field name="amount_python_compute">result = BRUT - categories.RETENUES</field>
+    </record>
+
+    <record id="hr_rule_total_charges_patronales" model="hr.salary.rule">
+        <field name="name">Total Charges Patronales</field>
+        <field name="sequence">150000</field>
+        <field name="code">TCOMP</field>
+        <field name="category_id" ref="other_totals"/>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = categories.COMP</field>
+    </record>
+
+
+    <record id="hr_rule_total" model="hr.salary.rule">
+        <field name="name">Cout total pour l'entreprise</field>
+        <field name="sequence">200000</field>
+        <field name="code">TOTAL</field>
+        <field name="category_id" ref="TOTAL"/>
+        <field name="appears_on_payslip" eval="False"/>
+        <field name="condition_select">none</field>
+        <field name="amount_select">code</field>
+        <field name="amount_python_compute">result = categories.BRUT + categories.COMP</field>
+    </record>
+
+
+
+
+
+
+    <record id="hr_payroll_rules_C1_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Assurance maladie, maternite, invalidite, deces, solidaritee des personnes agees et handicapees</field>
+        <field name="code">C1</field>
+        <field name="sequence">2040</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.75</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C1_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C1_employe"/>
+        <field name="name">Assurance maladie, maternite, invalidite, deces, solidaritee des personnes agees et handicapees</field>
+        <field name="code">C1P</field>
+        <field name="sequence">2045</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">13.10</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+
+
+    <record id="hr_payroll_rules_C2_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Vieillesse plafonnee</field>
+        <field name="code">C2</field>
+        <field name="sequence">2050</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">6.65</field>
+        <field name="amount_percentage_base">min(categories.BRUT,SECU)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C2_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C2_employe"/>
+        <field name="name">Vieillesse plafonnee</field>
+        <field name="code">C2P</field>
+        <field name="sequence">2055</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">8.3</field>
+        <field name="amount_percentage_base">min(categories.BRUT,SECU)</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+
+
+    <record id="hr_payroll_rules_C3_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Vieillesse deplafonnee</field>
+        <field name="code">C3</field>
+        <field name="sequence">2060</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.1</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C3_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C3_employe"/>
+        <field name="name">Vieillesse deplafonnee</field>
+        <field name="code">C3P</field>
+        <field name="sequence">2065</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">1.6</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C4_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Allocations familiales</field>
+        <field name="code">C4</field>
+        <field name="sequence">2070</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+	
+    <record id="hr_payroll_rules_C4_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C4_employe"/>
+        <field name="name">Allocations familiales</field>
+        <field name="code">C4P</field>
+        <field name="sequence">2075</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">5.4</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+
+
+
+
+
+    <record id="hr_payroll_rules_C10_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Assurance chomage</field>
+        <field name="code">C10</field>
+        <field name="sequence">2080</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">2.40</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TB)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C10_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C10_employe"/>
+        <field name="name">Assurance chomage</field>
+        <field name="code">C10P</field>
+        <field name="sequence">2085</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">4</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TB)</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C11_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGS (FNGS)</field>
+        <field name="code">C11</field>
+        <field name="sequence">2090</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TB)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C11_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C11_employe"/>
+        <field name="name">AGS (FNGS)</field>
+        <field name="code">C11P</field>
+        <field name="sequence">2095</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.3</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TB)</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C12_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">ARRCO Non-cadre Tranche 1</field>
+        <field name="code">C12</field>
+        <field name="sequence">2100</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">3</field>
+        <field name="amount_percentage_base">min(categories.BRUT,T1)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C12_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C12_employe"/>
+        <field name="name">ARRCO Non-cadre Tranche 1</field>
+        <field name="code">C12P</field>
+        <field name="sequence">2105</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">4.5</field>
+        <field name="amount_percentage_base">min(categories.BRUT,T1)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+
+
+    <record id="hr_payroll_rules_C14_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">ARRCO Non-cadre Tranche 2</field>
+        <field name="code">C14</field>
+        <field name="sequence">2110</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > T1</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">8</field>
+        <field name="amount_percentage_base">min(categories.BRUT-T1,T2-T1)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C14_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C14_employe"/>
+        <field name="name">ARRCO Non-cadre Tranche 2</field>
+        <field name="code">C14P</field>
+        <field name="sequence">2115</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > T1</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">12</field>
+        <field name="amount_percentage_base">min(categories.BRUT-T1,T2-T1)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+
+
+
+    <record id="hr_payroll_rules_C13_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGFF Non-cadre Tranche 1</field>
+        <field name="code">C13</field>
+        <field name="sequence">2120</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.8</field>
+        <field name="amount_percentage_base">min(categories.BRUT,T1)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C13_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C13_employe"/>
+        <field name="name">AGFF Non-cadre Tranche 1</field>
+        <field name="code">C13P</field>
+        <field name="sequence">2125</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">1.2</field>
+        <field name="amount_percentage_base">min(categories.BRUT,T1)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C15_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGFF Non-cadre Tranche 2</field>
+        <field name="code">C15</field>
+        <field name="sequence">2130</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > T1</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.9</field>
+        <field name="amount_percentage_base">min(categories.BRUT-T1,T2-T1)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C15_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C15_employe"/>
+        <field name="name">AGFF Non-cadre Tranche 2</field>
+        <field name="code">C15P</field>
+        <field name="sequence">2135</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > T1</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">1.3</field>
+        <field name="amount_percentage_base">min(categories.BRUT-T1,T2-T1)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+
+
+    <record id="hr_payroll_rules_C16_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">ARRCO Cadre Tranche A</field>
+        <field name="code">C16</field>
+        <field name="sequence">2140</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">3</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C16_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C16_employe"/>
+        <field name="name">ARRCO Cadre Tranche A</field>
+        <field name="code">C16P</field>
+        <field name="sequence">2145</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">4.5</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+
+
+    <record id="hr_payroll_rules_C17_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGIRC et GMP Cadre Tranche B</field>
+        <field name="code">C17</field>
+        <field name="sequence">2150</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TA</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">7.7</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TA,TB-TA)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C17_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C17_employe"/>
+        <field name="name">AGIRC et GMP Cadre Tranche B</field>
+        <field name="code">C17P</field>
+        <field name="sequence">2155</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TA</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">12.6</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TA,TB-TA)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+<!-- TO DO : Ajouter input pour les taux -->
+
+    <record id="hr_payroll_rules_C38_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGIRC Cadre Tranche C</field>
+        <field name="code">C38</field>
+        <field name="sequence">2160</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TB</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TB,TC-TB)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C38_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+		<field name="parent_rule_id" ref="hr_payroll_rules_C38_employe"/>
+        <field name="name">AGIRC Cadre Tranche C</field>
+        <field name="code">C38P</field>
+        <field name="sequence">2165</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TB</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TB,TC-TB)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C39_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGFF Cadre Tranche A</field>
+        <field name="code">C18</field>
+        <field name="sequence">2170</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.8</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C39_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C39_employe"/>
+        <field name="name">AGFF Cadre Tranche A</field>
+        <field name="code">C18P</field>
+        <field name="sequence">2175</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">1.2</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C18_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">AGFF Non-cadre Tranche B</field>
+        <field name="code">C18</field>
+        <field name="sequence">2180</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TA</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.9</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TA,TB-TA)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C18_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C18_employe"/>
+        <field name="name">AGFF Cadre Tranche B</field>
+        <field name="code">C18P</field>
+        <field name="sequence">2185</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TA</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">1.3</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TA,TB-TA)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C19_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">CET</field>
+        <field name="code">C19</field>
+        <field name="sequence">2190</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.13</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TC)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C19_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C19_employe"/>
+        <field name="name">CET</field>
+        <field name="code">C19P</field>
+        <field name="sequence">2195</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.22</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TC)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C20_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">APEC</field>
+        <field name="code">C20</field>
+        <field name="sequence">2200</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.024</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TB)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C20_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C20_employe"/>
+        <field name="name">APEC</field>
+        <field name="code">C20P</field>
+        <field name="sequence">2205</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.036</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TB)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+	
+    <record id="hr_payroll_rules_C21_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Assurance deces cadres</field>
+        <field name="code">C21</field>
+        <field name="sequence">2210</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C21_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C21_employe"/>
+        <field name="name">Assurance deces cadres</field>
+        <field name="code">C21P</field>
+        <field name="sequence">2215</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">1.5</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C5_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Accident du travail</field>
+        <field name="code">C5</field>
+        <field name="sequence">2220</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_retraite_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C5_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C5_employe"/>
+        <field name="name">Accident du travail</field>
+        <field name="code">C5P</field>
+        <field name="sequence">2225</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C35_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Prevoyance Cadre TA</field>
+        <field name="code">C35</field>
+        <field name="sequence">2230</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="register_id" ref="hr_prevoyance_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C35_employer" model="hr.salary.rule">
+        <field name="category_id" ref="PREV"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C35_employe"/>
+        <field name="name">Prevoyance Cadre TA</field>
+        <field name="code">C35P</field>
+        <field name="sequence">2231</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">min(categories.BRUT,TA)</field>
+        <field name="register_id" ref="hr_prevoyance_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C36_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Prevoyance Cadre TB</field>
+        <field name="code">C36</field>
+        <field name="sequence">2232</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TA</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TA,TB-TA)</field>
+        <field name="register_id" ref="hr_prevoyance_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C36_employer" model="hr.salary.rule">
+        <field name="category_id" ref="PREV"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C36_employe"/>
+        <field name="name">Prevoyance Cadre TB</field>
+        <field name="code">C36P</field>
+        <field name="sequence">2233</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.BRUT > TA</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">min(categories.BRUT-TA,TB-TA)</field>
+        <field name="register_id" ref="hr_prevoyance_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C37_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Forfait Mutuelle</field>
+        <field name="code">C37</field>
+        <field name="sequence">2234</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">fix</field>
+        <field name="register_id" ref="hr_prevoyance_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C37_employer" model="hr.salary.rule">
+        <field name="category_id" ref="PREV"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C37_employe"/>
+        <field name="name">Forfait Mutuelle</field>
+        <field name="code">C37P</field>
+        <field name="sequence">2235</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">fix</field>
+        <field name="register_id" ref="hr_prevoyance_register"/>
+    </record>
+
+	
+    <record id="hr_payroll_rules_C40_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Taxe Prevoyance</field>
+        <field name="code">C40</field>
+        <field name="sequence">2238</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.PREV != 0</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.PREV</field>
+        <field name="register_id" ref="hr_prevoyance_register"/>
+    </record>
+	
+    <record id="hr_payroll_rules_C40_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C40_employe"/>
+        <field name="name">Taxe Prevoyance</field>
+        <field name="code">C40P</field>
+        <field name="sequence">2239</field>
+        <field name="condition_select">python</field>
+        <field name="condition_python">result = categories.PREV != 0</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">8</field>
+        <field name="amount_percentage_base">categories.PREV</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C7_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">FNAL -20 Employes</field>
+        <field name="code">C7</field>
+        <field name="sequence">2240</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_max">19</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">min(categories.BRUT,SECU)</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>	
+
+    <record id="hr_payroll_rules_C7_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C7_employe"/>
+        <field name="name">FNAL -20 Employes</field>
+        <field name="code">C7P</field>
+        <field name="sequence">2245</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_max">19</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.1</field>
+        <field name="amount_percentage_base">min(categories.BRUT,SECU)</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C8_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">FNAL +20 Employes</field>
+        <field name="code">C8</field>
+        <field name="sequence">2250</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">20</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+	
+    <record id="hr_payroll_rules_C8_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C8_employe"/>
+        <field name="name">FNAL +20 Employes</field>
+        <field name="code">C8P</field>
+        <field name="sequence">2255</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">20</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.5</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+	
+
+    <record id="hr_payroll_rules_C9_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Versement Transport</field>
+        <field name="code">C9</field>
+        <field name="sequence">2260</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">10</field>
+        <field name="amount_select">percentage</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+	
+
+    <record id="hr_payroll_rules_C9_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C9_employe"/>
+        <field name="name">Versement Transport</field>
+        <field name="code">C9P</field>
+        <field name="sequence">2265</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">10</field>
+        <field name="amount_select">percentage</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C22_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Effort a la construction</field>
+        <field name="code">C22</field>
+        <field name="sequence">2270</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">20</field>
+        <field name="amount_select">percentage</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C22_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C22_employe"/>
+        <field name="name">Effort a la construction</field>
+        <field name="code">C22P</field>
+        <field name="sequence">2275</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">20</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.45</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C23_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Taxe d'apprentissage</field>
+        <field name="code">C23</field>
+        <field name="sequence">2280</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+	
+    <record id="hr_payroll_rules_C23_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C23_employe"/>
+        <field name="name">Taxe d'apprentissage</field>
+        <field name="code">C23P</field>
+        <field name="sequence">2285</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.5</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C24_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Contribution additionnelle au developpement de l'apprentissage</field>
+        <field name="code">C24</field>
+        <field name="sequence">2290</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+	
+    <record id="hr_payroll_rules_C24_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C24_employe"/>
+        <field name="name">Contribution additionnelle au developpement de l'apprentissage</field>
+        <field name="code">C24P</field>
+        <field name="sequence">2295</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.18</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C25_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Formation professionnelle 10- salaries</field>
+        <field name="code">C25</field>
+        <field name="sequence">2300</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_max">9</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+	
+    <record id="hr_payroll_rules_C25_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C25_employe"/>
+        <field name="name">Formation professionnelle 10- salaries</field>
+        <field name="code">C25P</field>
+        <field name="sequence">2305</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_max">9</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.55</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+
+
+
+    <record id="hr_payroll_rules_C26_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Formation professionnelle 10-19 salaries</field>
+        <field name="code">C26</field>
+        <field name="sequence">2310</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">10</field>
+        <field name="condition_range_max">19</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C26_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C26_employe"/>
+        <field name="name">Formation professionnelle 10-19 salaries</field>
+        <field name="code">C26P</field>
+        <field name="sequence">2315</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">10</field>
+        <field name="condition_range_max">19</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">1.05</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C27_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">Formation professionnelle 20+ salaries</field>
+        <field name="code">C27</field>
+        <field name="sequence">2320</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">20</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C27_employer" model="hr.salary.rule">
+        <field name="category_id" ref="hr_payroll.COMP"/>
+        <field name="parent_rule_id" ref="hr_payroll_rules_C27_employe"/>
+        <field name="name">Formation professionnelle 20+ salaries</field>
+        <field name="code">C27P</field>
+        <field name="sequence">2325</field>
+        <field name="condition_select">range</field>
+        <field name="condition_range">contract.employee_id.company_id.nombre_employes</field>
+        <field name="condition_range_min">20</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">1.60</field>
+        <field name="amount_percentage_base">categories.BRUT</field>
+        <field name="register_id" ref="hr_cci_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C29_employe" model="hr.salary.rule">
+        <field name="category_id" ref="SALC"/>
+        <field name="name">CSG deductible</field>
+        <field name="code">C29</field>
+        <field name="sequence">2500</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">5.1</field>
+        <field name="amount_percentage_base">(categories.BRUT + categories.PREV)*0.9825</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+    <record id="hr_payroll_rules_C28_employe" model="hr.salary.rule">
+        <field name="category_id" ref="RETENUES"/>
+        <field name="name">CSG non deductible</field>
+        <field name="code">C28</field>
+        <field name="sequence">2550</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">2.4</field>
+        <field name="amount_percentage_base">(categories.BRUT + categories.PREV)*0.9825</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+    <record id="hr_payroll_rules_C30_employe" model="hr.salary.rule">
+        <field name="category_id" ref="RETENUES"/>
+        <field name="name">CRDS</field>
+        <field name="code">C30</field>
+        <field name="sequence">2560</field>
+        <field name="condition_select">none</field>
+        <field name="amount_select">percentage</field>
+        <field name="amount_percentage">0.5</field>
+        <field name="amount_percentage_base">(categories.BRUT + categories.PREV)*0.9825</field>
+        <field name="appears_on_payslip" eval="True"/>
+        <field name="register_id" ref="hr_urssaf_register"/>
+    </record>
+
+
+
+
+        <!-- Salary Structure -->
+
+
+    <record id="hr_payroll_salary_structure_base" model="hr.payroll.structure">
+        <field name="code">Fr-Base</field>
+        <field name="name">Cotisations de base Employe Francais</field>
+        <field eval="[(6, 0, [ref('hr_payroll.hr_rule_basic'), ref('hr_payroll.hr_rule_taxable'),ref('hr_payroll.hr_rule_net'), ref('hr_rule_secu'), ref('hr_rule_tranche_a'), ref('hr_rule_tranche_b'), ref('hr_rule_tranche_c'), ref('hr_rule_tranche_1'), ref('hr_rule_tranche_2'), ref('hr_rule_total'), ref('hr_rule_total_charges_salariales'), ref('hr_rule_total_retenues'), ref('hr_rule_cumul_imposable'), ref('hr_rule_total_charges_patronales'), ref('hr_payroll_rules_C1_employe'), ref('hr_payroll_rules_C2_employe'), ref('hr_payroll_rules_C3_employe'), ref('hr_payroll_rules_C4_employe'), ref('hr_payroll_rules_C5_employe'), ref('hr_payroll_rules_C7_employe'), ref('hr_payroll_rules_C8_employe'), ref('hr_payroll_rules_C9_employe'), ref('hr_payroll_rules_C10_employe'), ref('hr_payroll_rules_C11_employe'), ref('hr_payroll_rules_C22_employe'), ref('hr_payroll_rules_C23_employe'), ref('hr_payroll_rules_C24_employe'), ref('hr_payroll_rules_C25_employe'), ref('hr_payroll_rules_C26_employe'), ref('hr_payroll_rules_C27_employe'), ref('hr_payroll_rules_C28_employe'), ref('hr_payroll_rules_C29_employe'), ref('hr_payroll_rules_C30_employe'), ref('hr_payroll_rules_C40_employe')])]" name="rule_ids"/>
+        <field name="company_id" ref="base.main_company"/>
+        <field name="parent_id" ref="hr_payroll.structure_base"/>
+    </record>
+
+
+    <record id="hr_payroll_salary_structure_employe_non_cadre" model="hr.payroll.structure">
+        <field name="code">Fr-NC</field>
+        <field name="name">Employe non-cadre</field>
+        <field eval="[(6, 0, [ref('hr_payroll_rules_C12_employe'), ref('hr_payroll_rules_C13_employe'), ref('hr_payroll_rules_C14_employe'), ref('hr_payroll_rules_C15_employe')])]" name="rule_ids"/>
+        <field name="company_id" ref="base.main_company"/>    
+        <field name="parent_id" ref="hr_payroll_salary_structure_base"/>
+    </record>
+
+
+    <record id="hr_payroll_salary_structure_employe_cadre" model="hr.payroll.structure">
+        <field name="code">Fr-C</field>
+        <field name="name">Employe cadre</field>
+        <field eval="[(6, 0, [ref('hr_payroll_rules_C16_employe'), ref('hr_payroll_rules_C17_employe'), ref('hr_payroll_rules_C18_employe'), ref('hr_payroll_rules_C19_employe'), ref('hr_payroll_rules_C20_employe'), ref('hr_payroll_rules_C21_employe'), ref('hr_payroll_rules_C38_employe'), ref('hr_payroll_rules_C39_employe')])]" name="rule_ids"/>
+        <field name="company_id" ref="base.main_company"/>    
+        <field name="parent_id" ref="hr_payroll_salary_structure_base"/>
+    </record>
+
+
+
+
+
+
+    </data>
+</openerp>
diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
new file mode 100755
index 00000000000..4bf8cdf018b
--- /dev/null
+++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    
+        <record id="res_company_form_l10n_fr_payroll" model="ir.ui.view">
+            <field name="name">res.company.form.l10n.fr.payroll</field>
+            <field name="model">res.company</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="inherit_id" ref="base.view_company_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//notebook" position="inside">
+                    <page string="Paie">
+                            <field name="plafond_secu"/>
+                            <field name="nombre_employes"/>
+                            <newline/>
+                            <field name="org_ss"/>
+                            <newline/>
+                            <field name="conv_coll"/>
+                    </page>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record id="hr_contract_view_form_l10n_fr_payroll" model="ir.ui.view">
+            <field name="name">hr.contract.view.form.l10n.fr.payroll</field>
+            <field name="model">hr.contract</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="inherit_id" ref="hr_payroll.hr_contract_form_inherit"/>
+            <field name="arch" type="xml">
+                 <field name="struct_id" position="after">
+                    <field name="qualif"/>
+                    <field name="niveau"/>
+                    <field name="coef"/>
+                 </field>
+            </field>
+        </record>
+
+        <record id="hr_payslip_form_l10n_fr_payroll" model="ir.ui.view">
+            <field name="name">hr.payslip.form.l10n.fr.payroll</field>
+            <field name="model">hr.payslip</field>
+            <field name="type">form</field>
+            <field name="priority">20</field>
+            <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
+            <field name="arch" type="xml">
+            <data>
+                 <xpath expr="//field[@name='paid']" position="after">
+                     <field name="payment_mode"/>
+                 </xpath>
+            </data>
+            </field>
+        </record>
+
+
+        <report
+            auto="False"
+            header="False"
+            id="fiche_paye"
+            model="hr.payslip"
+            name="fiche.paye"
+            rml="l10n_fr_hr_payroll/report/fiche_paye.rml"
+            string="Fiche de Paie" />
+
+
+    </data>
+</openerp>
diff --git a/addons/l10n_fr_hr_payroll/report/__init__.py b/addons/l10n_fr_hr_payroll/report/__init__.py
new file mode 100644
index 00000000000..40d2ccc3c05
--- /dev/null
+++ b/addons/l10n_fr_hr_payroll/report/__init__.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import fiche_paye
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
new file mode 100755
index 00000000000..e941be0079e
--- /dev/null
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    d$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from report import report_sxw
+
+class fiche_paye_parser(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(fiche_paye_parser, self).__init__(cr, uid, name, context)
+        self.localcontext.update({
+            'get_payslip_lines': self.get_payslip_lines,
+            'get_total_by_rule_category': self.get_total_by_rule_category,
+            'get_employer_line': self.get_employer_line,
+        })
+
+    def get_payslip_lines(self, objs):
+        payslip_line = self.pool.get('hr.payslip.line')
+        res = []
+        ids = []
+        for item in objs:
+            if item.appears_on_payslip == True and not item.salary_rule_id.parent_rule_id :
+                ids.append(item.id)
+        if ids:
+            res = payslip_line.browse(self.cr, self.uid, ids)
+        return res
+
+
+    def get_total_by_rule_category(self, obj, code):
+        payslip_line = self.pool.get('hr.payslip.line')
+        rule_cate_obj = self.pool.get('hr.salary.rule.category')
+
+        cate_ids = rule_cate_obj.search(self.cr, self.uid, [('code', '=', code)])
+
+        category_total = 0
+        if cate_ids:
+            line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id),('category_id.id', '=', cate_ids[0] )])
+            for line in payslip_line.browse(self.cr, self.uid, line_ids):
+                 category_total += line.total
+
+        return category_total
+
+
+    def get_employer_line(self, obj, parent_line):
+        
+        payslip_line = self.pool.get('hr.payslip.line')
+
+        line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id), ('salary_rule_id.parent_rule_id.id', '=', parent_line.salary_rule_id.id )])
+        res = line_ids and payslip_line.browse(self.cr, self.uid, line_ids[0]) or False
+
+        return res
+
+
+report_sxw.report_sxw('report.fiche.paye', 'hr.payslip', 'l10n_fr_hr_payroll/report/fiche_paye.rml', parser=fiche_paye_parser)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
new file mode 100644
index 00000000000..5221b00c462
--- /dev/null
+++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml
@@ -0,0 +1,449 @@
+<?xml version="1.0"?>
+<document filename="test.pdf">
+  <template pageSize="(595.0,842.0)" title="Fiche de paye" author="Yannick Buron" allowSplitting="20">
+    <pageTemplate id="first">
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="Standard_Outline">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau1">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau4">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau5">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau3">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="6,0" stop="6,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau11">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,0" stop="3,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,0" stop="4,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,0" stop="5,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="1,1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="3,1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="4,1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="5,1" stop="5,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="5,1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Tableau9">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,1" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,1" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,2" stop="0,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,2" stop="2,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#000000" start="0,3" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#000000" start="2,3" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="P1" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P2" rightIndent="-56.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P3" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P4" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P5" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT"/>
+    <paraStyle name="P6" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="14.0" leading="17" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P11" fontName="Helvetica"/>
+    <paraStyle name="P12" fontName="Helvetica" alignment="LEFT"/>
+    <paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P15" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P16" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P17" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P18" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P19" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P20" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P21" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="P22" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P23" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
+    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_space" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="Table Contents" fontName="Helvetica"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
+    <paraStyle name="payslip_adj" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_7" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="7.0" leading="9" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
+  </stylesheet>
+  <story>
+    <para style="P2">[[repeatIn(objects,'o')]]</para>
+    <blockTable colWidths="239.0,38.0,262.0" style="Tableau1">
+      <tr>
+        <td>
+          <blockTable colWidths="233.0" style="Tableau4">
+            <tr>
+              <td>
+                <para style="P10">BULLETIN DE PAIE</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P13">PAIE DU [[ formatLang(o.date_from, date=True) or '']] AU [[ formatLang(o.date_to, date=True) or '' ]]</para>
+          <blockTable colWidths="56.0,178.0" style="Tableau5">
+            <tr>
+              <td>
+                <para style="terp_default_8">Matricule : </para>
+                <para style="terp_default_8">N° s.s :</para>
+                <para style="terp_default_8">Emploi :</para>
+                <para style="terp_default_8">Qualif :</para>
+                <para style="terp_default_8">Niveau : </para>
+                <para style="terp_default_8">Coef :</para>
+                <para style="P7">Entrée :</para>
+              </td>
+              <td>
+                <para style="P5">[[o.employee_id.sinid or '_']]</para>
+                <para style="terp_default_8">[[o.employee_id.ssnid or '_']]</para>
+                <para style="terp_default_8">[[o.contract_id.job_id.name or '_']]</para>
+                <para style="terp_default_8">[[o.contract_id.qualif or '_']]</para>
+                <para style="terp_default_8">[[o.contract_id.niveau or '_']]</para>
+                <para style="terp_default_8">[[o.contract_id.coef or '_']]</para>
+                <para style="P5">[[o.contract_id.date_start or '_']] Sortie : [[o.contract_id.date_end or '']] </para>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <para style="P7">ORG. S.S :</para>
+              </td>
+              <td>
+                <para style="P7">[[o.employee_id.company_id.org_ss or '_']] </para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P14">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <blockTable colWidths="257.0" style="Tableau2">
+            <tr>
+              <td>
+                <para style="terp_default_8">[[o.employee_id.company_id.partner_id.title.name or '']] [[o.employee_id.company_id.name or '_']]</para>
+                <para style="terp_default_8">[[o.employee_id.company_id.street or '_']]</para>
+                <para style="terp_default_8">[[o.employee_id.company_id.street2 or '']] </para>
+                <para style="terp_default_8">[[o.employee_id.company_id.zip or '_']] [[o.employee_id.company_id.city or '']]</para>
+                <para style="terp_default_8">SIRET : [[o.employee_id.company_id.siret or '_']] APE : [[o.employee_id.company_id.ape or '_']]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+          <blockTable colWidths="257.0" style="Tableau3">
+            <tr>
+              <td>
+                <para style="terp_default_Bold_8">[[o.employee_id.name or '_']]</para>
+                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street or '_' ]]</para>
+                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.street2 or '' ]]</para>
+                <para style="terp_default_Bold_8">[[o.employee_id.address_home_id.zip or '_' ]] [[o.employee_id.address_home_id.city or '' ]]</para>
+              </td>
+            </tr>
+          </blockTable>
+          <para style="P5">
+            <font color="white"> </font>
+          </para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P11">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="255.0,56.0,56.0,58.0,113.0" style="Tableau7">
+      <tr>
+        <td>
+          <para style="P15">DESIGNATION</para>
+        </td>
+        <td>
+          <para style="P15">QUANTITE / BASE</para>
+        </td>
+        <td>
+          <para style="P15">TAUX</para>
+        </td>
+        <td>
+          <para style="P15">MONTANT</para>
+        </td>
+        <td>
+          <para style="P15">CHARGES PATRONALES</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="terp_default_8">[[repeatIn(get_payslip_lines(o.line_ids),'p')]]</para>
+      <blockTable colWidths="45.0,210.0,56.0,57.0,58.0,57.0,56.0" style="Tableau8">
+        <tr>
+          <td>
+            <para style="terp_default_7">[[ p.code or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_7">[[ p.name or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_7">[[ ((p.amount_select== 'percentage') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]]</para>
+            <para style="terp_default_7">[[ ((p.amount_select== 'fix') or removeParentNode('para')) and '' ]] [[ p.quantity or '' ]]</para>
+            <para style="terp_default_7">[[ ((p.amount_select&lt;&gt; 'fix' and p.amount_select&lt;&gt; 'percentage') or removeParentNode('para')) and '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_7">[[ ((p.amount_select == 'percentage') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]]</para>
+            <para style="terp_default_7">[[ ((p.amount_select &lt;&gt; 'percentage') or removeParentNode('para')) and '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_7">[[ p.total or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_7">[[ get_employer_line(o, p).rate or '']] </para>
+          </td>
+          <td>
+            <para style="terp_default_7">[[ get_employer_line(o,p).total or '' ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="360.0,89.0,89.0" style="Tableau11">
+      <tr>
+        <td>
+          <para style="terp_default_Bold_8">Mode de reglement : [[ o.payment_mode or '' ]]</para>
+          <para style="P20">Paye le : [[ formatLang(o.move_id.date, date=True) or '']]</para>
+        </td>
+        <td>
+          <para style="P18">NET A PAYER</para>
+        </td>
+        <td>
+          <para style="P18">TOTAL CHARGES PATRONALES</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P19">Conv. Coll.: [[ o.employee_id.company_id.conv_coll or '' ]]</para>
+        </td>
+        <td>
+          <para style="P21">[[ get_total_by_rule_category(o, 'NET') ]]</para>
+        </td>
+        <td>
+          <para style="P8">[[ get_total_by_rule_category(o, 'COMP') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="90.0,90.0,90.0,91.0,89.0,89.0" style="Tableau6">
+      <tr>
+        <td>
+          <para style="P16">SALAIRE BRUT</para>
+        </td>
+        <td>
+          <para style="P18">TOTAL CHARGES SALARIALES</para>
+        </td>
+        <td>
+          <para style="P18">NET IMPOSABLE</para>
+        </td>
+        <td>
+          <para style="P18">PLAFOND S.S.</para>
+        </td>
+        <td>
+          <para style="P17">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P16">COUT GLOBAL SALARIE</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="P8">[[ get_total_by_rule_category(o, 'BRUT') ]]</para>
+        </td>
+        <td>
+          <para style="P8">[[ get_total_by_rule_category(o, 'SALC') ]]</para>
+        </td>
+        <td>
+          <para style="P8">[[ get_total_by_rule_category(o, 'C_IMP') ]]</para>
+        </td>
+        <td>
+          <para style="P9">[[ o.employee_id.company_id.plafond_secu or '' ]]</para>
+        </td>
+        <td>
+          <para style="P17">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="P8">[[ get_total_by_rule_category(o, 'TOTAL') ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="P22">
+      <font color="white"> </font>
+    </para>
+
+    <para style="P3">
+      <font color="white"> </font>
+    </para>
+    <para style="P6">DANS VOTRE INTERET ET POUR VOUS AIDER A FAIRE VALOIR VOS DROITS, CONSERVEZ CE BULLETIN DE PAIE SANS LIMITATION DE DUREE</para>
+
+  </story>
+</document>
+
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index c6dab2fa6c4..eef3713fcb4 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -206,12 +206,16 @@
                                 </tree>
                             </field>
 
-                            <div class="oe_right">
-                                <group col="2">
+                            <div class="oe_form_subtotal_footer" colspan="4">
+                                <div>
                                     <field name="amount_untaxed" sum="Untaxed amount"/>
+                                </div>
+                                <div>
                                     <field name="amount_tax"/>
+                                </div>
+                                <div class="oe_form_subtotal_footer_separator">
                                     <field name="amount_total"/>
-                                </group>
+                                </div>
                             </div>
                             <div class="oe_clear"/>
 
diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml
index ad0b8440f19..a0b8f39565c 100644
--- a/addons/sale_margin/sale_margin_view.xml
+++ b/addons/sale_margin/sale_margin_view.xml
@@ -8,9 +8,11 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <field name="amount_total" position="after">
-                <field name="margin"/>
-            </field>
+            <xpath expr="//div[@class='oe_form_subtotal_footer_separator']" position="after">
+                <div>
+                    <field name="margin"/>
+                </div>
+            </xpath>
         </field>
     </record>