Merge lp:~camptocamp/account-consolidation/consolidation_vre_test_improvement_resubmit into lp:~account-core-editors/account-consolidation/7.0

[Vincent Renaville@camptocamp]

This merge add :

- Translation
- Add a check to see if all "normal" account is linked to a consolidated account
- add label in consolidation check wizard to help the user to understand the check test purpose

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Hi Vincent,

You seems to have conflicts here, can you solve that ? In the meanwhile:

 * Remove the space line 1053, 1073
 * Line 1026, 1033 : you forget the context=context in the search methods

Regards,

Joël

review: Approve (code review, no tests)

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Sorry, I mark it as approve instead of Need Fixing

review: Needs Fixing (code review, no tests)

[Vincent Renaville@camptocamp (vrenaville-c2c)]

Hello,

The file conflicts for file adding so I do a resubmit of a new branch.

I have also fix you issue.

Thanks for your review.

Vincent

[Frederic Clementi - Camptocamp (frederic-clementi)]

Tested - Works fine.

review: Approve (functional)

[lp:~camptocamp/account-consolidation/consolidation_vre_test_improvement_resubmit]

22. By Vincent Renaville@camptocamp on 2013-12-17

[FIx] display name of the subsidary instead of display the browse record in the error message

23. By Yannick Vaucher @ Camptocamp on 2013-12-18

[PEP8]

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Did so PEP8 fixes

Otherwise LGTM

review: Approve (code review, no tests)

=== added file 'account_consolidation/i18n/account_consolidation.pot'
--- account_consolidation/i18n/account_consolidation.pot	1970-01-01 00:00:00 +0000
+++ account_consolidation/i18n/account_consolidation.pot	2013-12-18 17:06:15 +0000
@@ -0,0 +1,488 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_consolidation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-13 09:10+0000\n"
+"PO-Revision-Date: 2013-12-13 09:10+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_consolidation
+#: help:account.account,consolidation_rate_type_id:0
+msgid "Currency rate type used on this account for the consolidation. Leave empty to use the rate type of the account type."
+msgstr ""
+
+#. module: account_consolidation
+#: help:account.consolidation.consolidate,from_period_id:0
+msgid "Select the same period in 'from' and 'to' if you want to proceed with a single period. Start Period is ignored for Year To Date accounts."
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_consolidation_base
+#: model:ir.model,name:account_consolidation.model_account_consolidation_consolidate
+msgid "Common consolidation wizard. Intended to be inherited"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.account,consolidation_mode:0
+#: field:account.account.type,consolidation_mode:0
+msgid "Consolidation Mode"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:375
+#, python-format
+msgid "Invalid periods, please launch the \"Consolidation: Checks\" wizard"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:67
+#, python-format
+msgid "Invalid charts"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:434
+#, python-format
+msgid "Consolidation %s"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check  Chart 2 : For each subsidiary, check consistency between the regular chart of accounts and the consolidation chart."
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:53
+#, python-format
+msgid "Chart of Accounts are OK."
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:261
+#, python-format
+msgid "Consolidation line in %s mode"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.move,consol_company_id:0
+msgid "Consolidated from Company"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.move.line:0
+msgid "Period"
+msgstr ""
+
+#. module: account_consolidation
+#: help:account.consolidation.base,fiscalyear_id:0
+#: help:account.consolidation.check,fiscalyear_id:0
+#: help:account.consolidation.consolidate,fiscalyear_id:0
+msgid "The checks will be done on the periods of the selected fiscal year."
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_account_type
+msgid "Account Type"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.base,holding_chart_account_id:0
+#: field:account.consolidation.check,holding_chart_account_id:0
+#: field:account.consolidation.consolidate,holding_chart_account_id:0
+msgid "Chart of Accounts"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.consolidate:0
+msgid "Run the consolidation for the selected periods and subsidiaries."
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:185
+#, python-format
+msgid "Settings ERROR"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+#: view:account.consolidation.consolidate:0
+msgid "or"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:59
+#: code:addons/account_consolidation/wizard/consolidation_check.py:85
+#: code:addons/account_consolidation/wizard/consolidation_check.py:110
+#, python-format
+msgid "%s :"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.base,subsidiary_ids:0
+#: field:account.consolidation.check,subsidiary_ids:0
+#: field:account.consolidation.consolidate,subsidiary_ids:0
+msgid "Subsidiaries"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.account.type:0
+msgid "Description"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:300
+#, python-format
+msgid "Code %s is mapping %s times"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Periods"
+msgstr ""
+
+#. module: account_consolidation
+#: selection:account.account,consolidation_mode:0
+#: selection:account.account.type,consolidation_mode:0
+msgid "Period Movements"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.base,company_id:0
+#: field:account.consolidation.check,company_id:0
+#: field:account.consolidation.consolidate,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+#: model:ir.actions.act_window,name:account_consolidation.action_consolidation_checks
+#: model:ir.ui.menu,name:account_consolidation.menu_consolidation_checks
+msgid "Consolidation: Checks"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.account:0
+#: view:account.account.type:0
+#: model:ir.ui.menu,name:account_consolidation.menu_consolidation
+msgid "Consolidation"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:78
+#, python-format
+msgid "Periods are OK."
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.move.line:0
+#: field:account.move.line,consol_company_id:0
+msgid "Subsidaries"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:186
+#, python-format
+msgid "Please set the \"Consolidation difference account\" in company %s"
+msgstr ""
+
+#. module: account_consolidation
+#: field:res.company,consolidation_chart_account_id:0
+msgid "Chart of Accounts for Consolidation"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:90
+#: code:addons/account_consolidation/wizard/consolidation_check.py:115
+#, python-format
+msgid "Invalid periods"
+msgstr ""
+
+#. module: account_consolidation
+#: help:account.consolidation.consolidate,to_period_id:0
+msgid "The consolidation will be done at the very last date of the selected period."
+msgstr ""
+
+#. module: account_consolidation
+#: field:res.company,consolidation_diff_account_id:0
+msgid "Consolidation difference account"
+msgstr ""
+
+#. module: account_consolidation
+#: view:res.company:0
+msgid "Accounts Consolidation"
+msgstr ""
+
+#. module: account_consolidation
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.consolidate,target_move:0
+msgid "Target Moves"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.consolidate,from_period_id:0
+msgid "Start Period"
+msgstr ""
+
+#. module: account_consolidation
+#: model:res.groups,name:account_consolidation.consolidation_manager
+msgid "Consolidation manager"
+msgstr ""
+
+#. module: account_consolidation
+#: help:res.company,consolidation_chart_account_id:0
+msgid "Current company root account to be used when consolidating"
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_account
+msgid "Account"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:350
+#, python-format
+msgid "No chart of accounts for company %s"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Prepare your consolidation and make sure that your consolidation will be correct by proceeding with the checks. The 'Check Periods' verify if fiscal year exists for each subsidiary, and if the periods have the same beginning and ending dates. The 'Check Charts' verify if subsidiary accounts are missing in the Holding's Chart of Accounts."
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:176
+#, python-format
+msgid "Period from %s to %s not found in holding company %s"
+msgstr ""
+
+#. module: account_consolidation
+#: selection:account.consolidation.consolidate,target_move:0
+msgid "All Posted Entries"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:162
+#, python-format
+msgid "Holding company has less periods than the subsidiary company %s!"
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.consolidate,to_period_id:0
+msgid "End Period"
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.actions.act_window,help:account_consolidation.action_account_moves_all_a
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"          Select the period and the journal you want to fill.\n"
+"          </p><p>\n"
+"          This view can be used by accountants in order to quickly record\n"
+"          entries in OpenERP. If you want to record a supplier invoice,\n"
+"          start by recording the line of the expense account. OpenERP\n"
+"          will propose to you automatically the Tax related to this\n"
+"          account and the counterpart \"Account Payable\".\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.base,fiscalyear_id:0
+#: field:account.consolidation.check,fiscalyear_id:0
+#: field:account.consolidation.consolidate,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr ""
+
+#. module: account_consolidation
+#: help:account.account,consolidation_mode:0
+#: help:account.account.type,consolidation_mode:0
+msgid "This must be set on the holding company accounts only"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:62
+#, python-format
+msgid "Account with code %s does not exist on the Holding company."
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:380
+#, python-format
+msgid "Invalid charts, please launch the \"Consolidation: Checks\" wizard"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:349
+#: code:addons/account_consolidation/wizard/consolidation_base.py:374
+#: code:addons/account_consolidation/wizard/consolidation_base.py:379
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+#: view:account.consolidation.consolidate:0
+msgid "Subsidiaries to Consolidate"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Charts 1"
+msgstr ""
+
+#. module: account_consolidation
+#: selection:account.account,consolidation_mode:0
+#: selection:account.account.type,consolidation_mode:0
+msgid "YTD"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Period : Check consistency of accounting periods between subsidiaries and holding company."
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Chart 1 : Check consistency between subsidiaries consolidation chart and Holding company chart."
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.move.line,is_current_company:0
+msgid "Current company"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:207
+#, python-format
+msgid "Consolidation difference in mode %s"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.consolidate:0
+msgid "Consolidate"
+msgstr ""
+
+#. module: account_consolidation
+#: constraint:account.consolidation.consolidate:0
+msgid "Start Period and End Period must be of the same Fiscal Year !"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.consolidate:0
+#: model:ir.actions.act_window,name:account_consolidation.action_consolidation_consolidate
+#: model:ir.ui.menu,name:account_consolidation.menu_consolidation_consolidate
+msgid "Consolidation: Consolidate"
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.ui.menu,name:account_consolidation.menu_conso_entries
+msgid "Consolidation Entries"
+msgstr ""
+
+#. module: account_consolidation
+#: help:res.company,consolidation_diff_account_id:0
+msgid "Conso. differences will be affected to this account"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Charts 2"
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_consolidation_check
+msgid "Consolidation Checks. Model used for views"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:141
+#, python-format
+msgid "The fiscal year of the subsidiary company %s does not exists from %s to %s"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:504
+#, python-format
+msgid "Consolidated Entries"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:52
+#: code:addons/account_consolidation/wizard/consolidation_check.py:78
+#: code:addons/account_consolidation/wizard/consolidation_check.py:103
+#, python-format
+msgid "Validation"
+msgstr ""
+
+#. module: account_consolidation
+#: model:res.groups,name:account_consolidation.consolidation_user
+msgid "Consolidation user"
+msgstr ""
+
+#. module: account_consolidation
+#: help:account.account.type,consolidation_rate_type_id:0
+msgid "Currency rate type used on this account type for the consolidation. Leave empty to use the 'spot' rate type."
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.consolidate:0
+msgid "Holding Chart of Accounts"
+msgstr ""
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+#: view:account.consolidation.consolidate:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:103
+#, python-format
+msgid "All account is mapped"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.account,consolidation_rate_type_id:0
+#: field:account.account.type,consolidation_rate_type_id:0
+msgid "Consolidation Currency Rate Type"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.consolidate,journal_id:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_consolidation
+#: selection:account.consolidation.consolidate,target_move:0
+msgid "All Entries"
+msgstr ""
+
+#. module: account_consolidation
+#: model:ir.actions.act_window,name:account_consolidation.action_account_moves_all_a
+#: model:ir.model,name:account_consolidation.model_account_move_line
+#: model:ir.ui.menu,name:account_consolidation.menu_action_account_moves_all
+msgid "Journal Items"
+msgstr ""
+
 
=== removed file 'account_consolidation/i18n/account_consolidation.pot'
--- account_consolidation/i18n/account_consolidation.pot	2013-10-21 09:14:25 +0000
+++ account_consolidation/i18n/account_consolidation.pot	1970-01-01 00:00:00 +0000
@@ -1,453 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_consolidation
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-21 09:06+0000\n"
-"PO-Revision-Date: 2013-10-21 09:06+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_consolidation
-#: help:account.account,consolidation_rate_type_id:0
-msgid "Currency rate type used on this account for the consolidation. Leave empty to use the rate type of the account type."
-msgstr ""
-
-#. module: account_consolidation
-#: help:account.consolidation.consolidate,from_period_id:0
-msgid "Select the same period in 'from' and 'to' if you want to proceed with a single period. Start Period is ignored for Year To Date accounts."
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.model,name:account_consolidation.model_account_consolidation_base
-#: model:ir.model,name:account_consolidation.model_account_consolidation_consolidate
-msgid "Common consolidation wizard. Intended to be inherited"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.account,consolidation_mode:0
-#: field:account.account.type,consolidation_mode:0
-msgid "Consolidation Mode"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_base.py:323
-#, python-format
-msgid "Invalid periods, please launch the \"Consolidation: Checks\" wizard"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_check.py:67
-#, python-format
-msgid "Invalid charts"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:434
-#, python-format
-msgid "Consolidation %s"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_check.py:53
-#, python-format
-msgid "Chart of Accounts are OK."
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:261
-#, python-format
-msgid "Consolidation line in %s mode"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.move,consol_company_id:0
-msgid "Consolidated from Company"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.move.line:0
-msgid "Period"
-msgstr ""
-
-#. module: account_consolidation
-#: help:account.consolidation.base,fiscalyear_id:0
-#: help:account.consolidation.check,fiscalyear_id:0
-#: help:account.consolidation.consolidate,fiscalyear_id:0
-msgid "The checks will be done on the periods of the selected fiscal year."
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.model,name:account_consolidation.model_account_account_type
-msgid "Account Type"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.consolidation.base,holding_chart_account_id:0
-#: field:account.consolidation.check,holding_chart_account_id:0
-#: field:account.consolidation.consolidate,holding_chart_account_id:0
-msgid "Chart of Accounts"
-msgstr ""
-
-#. module: account_consolidation
-#: help:account.consolidation.consolidate,to_period_id:0
-msgid "The consolidation will be done at the very last date of the selected period."
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:185
-#, python-format
-msgid "Settings ERROR"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_check.py:59
-#: code:addons/account_consolidation/wizard/consolidation_check.py:85
-#, python-format
-msgid "%s :"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.consolidation.base,subsidiary_ids:0
-#: field:account.consolidation.check,subsidiary_ids:0
-#: field:account.consolidation.consolidate,subsidiary_ids:0
-msgid "Subsidiaries"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.account.type:0
-msgid "Description"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_base.py:328
-#, python-format
-msgid "Invalid charts, please launch the \"Consolidation: Checks\" wizard"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.check:0
-msgid "Check Periods"
-msgstr ""
-
-#. module: account_consolidation
-#: selection:account.account,consolidation_mode:0
-#: selection:account.account.type,consolidation_mode:0
-msgid "Period Movements"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.consolidation.base,company_id:0
-#: field:account.consolidation.check,company_id:0
-#: field:account.consolidation.consolidate,company_id:0
-msgid "Company"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.check:0
-#: model:ir.actions.act_window,name:account_consolidation.action_consolidation_checks
-#: model:ir.ui.menu,name:account_consolidation.menu_consolidation_checks
-msgid "Consolidation: Checks"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.account:0
-#: view:account.account.type:0
-#: model:ir.ui.menu,name:account_consolidation.menu_consolidation
-msgid "Consolidation"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.check:0
-msgid "Check Charts"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.move.line:0
-#: field:account.move.line,consol_company_id:0
-msgid "Subsidaries"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:186
-#, python-format
-msgid "Please set the \"Consolidation difference account\" in company %s"
-msgstr ""
-
-#. module: account_consolidation
-#: field:res.company,consolidation_chart_account_id:0
-msgid "Chart of Accounts for Consolidation"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_check.py:90
-#, python-format
-msgid "Invalid periods"
-msgstr ""
-
-#. module: account_consolidation
-#: field:res.company,consolidation_diff_account_id:0
-msgid "Consolidation difference account"
-msgstr ""
-
-#. module: account_consolidation
-#: view:res.company:0
-msgid "Accounts Consolidation"
-msgstr ""
-
-#. module: account_consolidation
-#: view:res.company:0
-msgid "Configuration"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.consolidation.consolidate,target_move:0
-msgid "Target Moves"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.consolidation.consolidate,from_period_id:0
-msgid "Start Period"
-msgstr ""
-
-#. module: account_consolidation
-#: model:res.groups,name:account_consolidation.consolidation_manager
-msgid "Consolidation manager"
-msgstr ""
-
-#. module: account_consolidation
-#: help:res.company,consolidation_chart_account_id:0
-msgid "Current company root account to be used when consolidating"
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.model,name:account_consolidation.model_account_account
-msgid "Account"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_base.py:297
-#, python-format
-msgid "No chart of accounts for company %s"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.check:0
-msgid "Prepare your consolidation and make sure that your consolidation will be correct by proceeding with the checks. The 'Check Periods' verify if fiscal year exists for each subsidiary, and if the periods have the same beginning and ending dates. The 'Check Charts' verify if subsidiary accounts are missing in the Holding's Chart of Accounts."
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_base.py:176
-#, python-format
-msgid "Period from %s to %s not found in holding company %s"
-msgstr ""
-
-#. module: account_consolidation
-#: selection:account.consolidation.consolidate,target_move:0
-msgid "All Posted Entries"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_base.py:162
-#, python-format
-msgid "Holding company has less periods than the subsidiary company %s!"
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.model,name:account_consolidation.model_res_company
-msgid "Companies"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.consolidation.consolidate,to_period_id:0
-msgid "End Period"
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.actions.act_window,help:account_consolidation.action_account_moves_all_a
-msgid "<p class=\"oe_view_nocontent_create\">\n"
-"          Select the period and the journal you want to fill.\n"
-"          </p><p>\n"
-"          This view can be used by accountants in order to quickly record\n"
-"          entries in OpenERP. If you want to record a supplier invoice,\n"
-"          start by recording the line of the expense account. OpenERP\n"
-"          will propose to you automatically the Tax related to this\n"
-"          account and the counterpart \"Account Payable\".\n"
-"        </p>\n"
-"      "
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.consolidation.base,fiscalyear_id:0
-#: field:account.consolidation.check,fiscalyear_id:0
-#: field:account.consolidation.consolidate,fiscalyear_id:0
-msgid "Fiscal Year"
-msgstr ""
-
-#. module: account_consolidation
-#: help:account.account,consolidation_mode:0
-#: help:account.account.type,consolidation_mode:0
-msgid "This must be set on the holding company accounts only"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_check.py:62
-#, python-format
-msgid "Account with code %s does not exist on the Holding company."
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_base.py:296
-#: code:addons/account_consolidation/wizard/consolidation_base.py:322
-#: code:addons/account_consolidation/wizard/consolidation_base.py:327
-#, python-format
-msgid "Error"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.check:0
-#: view:account.consolidation.consolidate:0
-msgid "Subsidiaries to Consolidate"
-msgstr ""
-
-#. module: account_consolidation
-#: selection:account.account,consolidation_mode:0
-#: selection:account.account.type,consolidation_mode:0
-msgid "YTD"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.consolidate:0
-msgid "Run the consolidation for the selected periods and subsidiaries."
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.move.line,is_current_company:0
-msgid "Current company"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:207
-#, python-format
-msgid "Consolidation difference in mode %s"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.consolidate:0
-msgid "Consolidate"
-msgstr ""
-
-#. module: account_consolidation
-#: constraint:account.consolidation.consolidate:0
-msgid "Start Period and End Period must be of the same Fiscal Year !"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.consolidate:0
-#: model:ir.actions.act_window,name:account_consolidation.action_consolidation_consolidate
-#: model:ir.ui.menu,name:account_consolidation.menu_consolidation_consolidate
-msgid "Consolidation: Consolidate"
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.model,name:account_consolidation.model_account_move
-msgid "Account Entry"
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.ui.menu,name:account_consolidation.menu_conso_entries
-msgid "Consolidation Entries"
-msgstr ""
-
-#. module: account_consolidation
-#: help:res.company,consolidation_diff_account_id:0
-msgid "Conso. differences will be affected to this account"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_base.py:141
-#, python-format
-msgid "The fiscal year of the subsidiary company %s does not exists from %s to %s"
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.model,name:account_consolidation.model_account_consolidation_check
-msgid "Consolidation Checks. Model used for views"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.check:0
-#: view:account.consolidation.consolidate:0
-msgid "or"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:504
-#, python-format
-msgid "Consolidated Entries"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_check.py:52
-#: code:addons/account_consolidation/wizard/consolidation_check.py:78
-#, python-format
-msgid "Validation"
-msgstr ""
-
-#. module: account_consolidation
-#: code:addons/account_consolidation/wizard/consolidation_check.py:78
-#, python-format
-msgid "Periods are OK."
-msgstr ""
-
-#. module: account_consolidation
-#: model:res.groups,name:account_consolidation.consolidation_user
-msgid "Consolidation user"
-msgstr ""
-
-#. module: account_consolidation
-#: help:account.account.type,consolidation_rate_type_id:0
-msgid "Currency rate type used on this account type for the consolidation. Leave empty to use the 'spot' rate type."
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.consolidate:0
-msgid "Holding Chart of Accounts"
-msgstr ""
-
-#. module: account_consolidation
-#: view:account.consolidation.check:0
-#: view:account.consolidation.consolidate:0
-msgid "Cancel"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.account,consolidation_rate_type_id:0
-#: field:account.account.type,consolidation_rate_type_id:0
-msgid "Consolidation Currency Rate Type"
-msgstr ""
-
-#. module: account_consolidation
-#: field:account.consolidation.consolidate,journal_id:0
-msgid "Journal"
-msgstr ""
-
-#. module: account_consolidation
-#: selection:account.consolidation.consolidate,target_move:0
-msgid "All Entries"
-msgstr ""
-
-#. module: account_consolidation
-#: model:ir.actions.act_window,name:account_consolidation.action_account_moves_all_a
-#: model:ir.model,name:account_consolidation.model_account_move_line
-#: model:ir.ui.menu,name:account_consolidation.menu_action_account_moves_all
-msgid "Journal Items"
-msgstr ""
-
 
=== added file 'account_consolidation/i18n/fr.po'
--- account_consolidation/i18n/fr.po	1970-01-01 00:00:00 +0000
+++ account_consolidation/i18n/fr.po	2013-12-18 17:06:15 +0000
@@ -0,0 +1,488 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_consolidation
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 7.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-12-13 09:10+0000\n"
+"PO-Revision-Date: 2013-12-13 09:10+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_consolidation
+#: help:account.account,consolidation_rate_type_id:0
+msgid "Currency rate type used on this account for the consolidation. Leave empty to use the rate type of the account type."
+msgstr "Type du taux de devise utilisé sur ce compte pour la consolidation. Laissez vide pour utiliser le type de devise indiqué au niveau du type de compte"
+
+#. module: account_consolidation
+#: help:account.consolidation.consolidate,from_period_id:0
+msgid "Select the same period in 'from' and 'to' if you want to proceed with a single period. Start Period is ignored for Year To Date accounts."
+msgstr "Sélectionnez la même periode de début et de fin si vous ne voulez qu'une seule période. 'Période début' est ignoré pour les champs consolidé en mode 'YTD'"
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_consolidation_base
+#: model:ir.model,name:account_consolidation.model_account_consolidation_consolidate
+msgid "Common consolidation wizard. Intended to be inherited"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.account,consolidation_mode:0
+#: field:account.account.type,consolidation_mode:0
+msgid "Consolidation Mode"
+msgstr "Mode de consolidation"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:375
+#, python-format
+msgid "Invalid periods, please launch the \"Consolidation: Checks\" wizard"
+msgstr "Périodes invalide, SVP lancez le menu \"Consolidation: Contôles\" "
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:67
+#, python-format
+msgid "Invalid charts"
+msgstr "Plan comptables invalides"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:434
+#, python-format
+msgid "Consolidation %s"
+msgstr "Consolidation %s"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check  Chart 2 : For each subsidiary, check consistency between the regular chart of accounts and the consolidation chart."
+msgstr "Contrôle Plans Comptables : Pour chaque filiale, vérifie la cohérence entre le plan comptable local et le plan consolidé"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:53
+#, python-format
+msgid "Chart of Accounts are OK."
+msgstr "Plans comptables : OK "
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:261
+#, python-format
+msgid "Consolidation line in %s mode"
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.move,consol_company_id:0
+msgid "Consolidated from Company"
+msgstr "Filiale"
+
+#. module: account_consolidation
+#: view:account.move.line:0
+msgid "Period"
+msgstr "Période"
+
+#. module: account_consolidation
+#: help:account.consolidation.base,fiscalyear_id:0
+#: help:account.consolidation.check,fiscalyear_id:0
+#: help:account.consolidation.consolidate,fiscalyear_id:0
+msgid "The checks will be done on the periods of the selected fiscal year."
+msgstr "Les contrôles seront effectués sur les périodes de l'excercice comptable sélectionné"
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_account_type
+msgid "Account Type"
+msgstr "Type de compte"
+
+#. module: account_consolidation
+#: field:account.consolidation.base,holding_chart_account_id:0
+#: field:account.consolidation.check,holding_chart_account_id:0
+#: field:account.consolidation.consolidate,holding_chart_account_id:0
+msgid "Chart of Accounts"
+msgstr "Plan comptable"
+
+#. module: account_consolidation
+#: view:account.consolidation.consolidate:0
+msgid "Run the consolidation for the selected periods and subsidiaries."
+msgstr "Lancer la consolidation sur les périodes et les filiales sélectionnées "
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:185
+#, python-format
+msgid "Settings ERROR"
+msgstr "Erreur de paramétrage"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+#: view:account.consolidation.consolidate:0
+msgid "or"
+msgstr "ou"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:59
+#: code:addons/account_consolidation/wizard/consolidation_check.py:85
+#: code:addons/account_consolidation/wizard/consolidation_check.py:110
+#, python-format
+msgid "%s :"
+msgstr "%s :"
+
+#. module: account_consolidation
+#: field:account.consolidation.base,subsidiary_ids:0
+#: field:account.consolidation.check,subsidiary_ids:0
+#: field:account.consolidation.consolidate,subsidiary_ids:0
+msgid "Subsidiaries"
+msgstr "Filiales"
+
+#. module: account_consolidation
+#: view:account.account.type:0
+msgid "Description"
+msgstr "Description"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:300
+#, python-format
+msgid "Code %s is mapping %s times"
+msgstr "Le compte %s est liés à un compte consolidé %s fois"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Periods"
+msgstr "Contrôle Périodes"
+
+#. module: account_consolidation
+#: selection:account.account,consolidation_mode:0
+#: selection:account.account.type,consolidation_mode:0
+msgid "Period Movements"
+msgstr "Mouvements par période"
+
+#. module: account_consolidation
+#: field:account.consolidation.base,company_id:0
+#: field:account.consolidation.check,company_id:0
+#: field:account.consolidation.consolidate,company_id:0
+msgid "Company"
+msgstr "Société"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+#: model:ir.actions.act_window,name:account_consolidation.action_consolidation_checks
+#: model:ir.ui.menu,name:account_consolidation.menu_consolidation_checks
+msgid "Consolidation: Checks"
+msgstr "Consolidation: Contrôle"
+
+#. module: account_consolidation
+#: view:account.account:0
+#: view:account.account.type:0
+#: model:ir.ui.menu,name:account_consolidation.menu_consolidation
+msgid "Consolidation"
+msgstr "Consolidation"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:78
+#, python-format
+msgid "Periods are OK."
+msgstr "Periodes OK."
+
+#. module: account_consolidation
+#: view:account.move.line:0
+#: field:account.move.line,consol_company_id:0
+msgid "Subsidaries"
+msgstr "Filiales"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:186
+#, python-format
+msgid "Please set the \"Consolidation difference account\" in company %s"
+msgstr "Veuilez paramétrer le \"Compte d'écart de consolidation\" pour la société %s"
+
+#. module: account_consolidation
+#: field:res.company,consolidation_chart_account_id:0
+msgid "Chart of Accounts for Consolidation"
+msgstr "Plan comptable consolidé"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:90
+#: code:addons/account_consolidation/wizard/consolidation_check.py:115
+#, python-format
+msgid "Invalid periods"
+msgstr "Périodes invalides"
+
+#. module: account_consolidation
+#: help:account.consolidation.consolidate,to_period_id:0
+msgid "The consolidation will be done at the very last date of the selected period."
+msgstr "Les écritures de consolidation seront passées le dernier jour de la période sélectionnée"
+
+#. module: account_consolidation
+#: field:res.company,consolidation_diff_account_id:0
+msgid "Consolidation difference account"
+msgstr "Compte d'écart de consolidation"
+
+#. module: account_consolidation
+#: view:res.company:0
+msgid "Accounts Consolidation"
+msgstr "Comptes de consolidation"
+
+#. module: account_consolidation
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuration"
+
+#. module: account_consolidation
+#: field:account.consolidation.consolidate,target_move:0
+msgid "Target Moves"
+msgstr "Ecritures cibles"
+
+#. module: account_consolidation
+#: field:account.consolidation.consolidate,from_period_id:0
+msgid "Start Period"
+msgstr "Période de début"
+
+#. module: account_consolidation
+#: model:res.groups,name:account_consolidation.consolidation_manager
+msgid "Consolidation manager"
+msgstr "Responsable"
+
+#. module: account_consolidation
+#: help:res.company,consolidation_chart_account_id:0
+msgid "Current company root account to be used when consolidating"
+msgstr "Plan comptable consolidé de la société"
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_account
+msgid "Account"
+msgstr "Compte"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:350
+#, python-format
+msgid "No chart of accounts for company %s"
+msgstr "Pas de plan comptable pour la société %s"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Prepare your consolidation and make sure that your consolidation will be correct by proceeding with the checks. The 'Check Periods' verify if fiscal year exists for each subsidiary, and if the periods have the same beginning and ending dates. The 'Check Charts' verify if subsidiary accounts are missing in the Holding's Chart of Accounts."
+msgstr "Contrôle préalables au lancement des écritures de consolidation"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:176
+#, python-format
+msgid "Period from %s to %s not found in holding company %s"
+msgstr "Périodes de %s à %s non trouvées dans la société holding"
+
+#. module: account_consolidation
+#: selection:account.consolidation.consolidate,target_move:0
+msgid "All Posted Entries"
+msgstr "Ecritures validées seulement"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:162
+#, python-format
+msgid "Holding company has less periods than the subsidiary company %s!"
+msgstr "La holding a moins de périodes comptables créées que la filiale %s"
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_res_company
+msgid "Companies"
+msgstr "Sociétés"
+
+#. module: account_consolidation
+#: field:account.consolidation.consolidate,to_period_id:0
+msgid "End Period"
+msgstr "Période de fin"
+
+#. module: account_consolidation
+#: model:ir.actions.act_window,help:account_consolidation.action_account_moves_all_a
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"          Select the period and the journal you want to fill.\n"
+"          </p><p>\n"
+"          This view can be used by accountants in order to quickly record\n"
+"          entries in OpenERP. If you want to record a supplier invoice,\n"
+"          start by recording the line of the expense account. OpenERP\n"
+"          will propose to you automatically the Tax related to this\n"
+"          account and the counterpart \"Account Payable\".\n"
+"        </p>\n"
+"      "
+msgstr ""
+
+#. module: account_consolidation
+#: field:account.consolidation.base,fiscalyear_id:0
+#: field:account.consolidation.check,fiscalyear_id:0
+#: field:account.consolidation.consolidate,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Excercice comptable"
+
+#. module: account_consolidation
+#: help:account.account,consolidation_mode:0
+#: help:account.account.type,consolidation_mode:0
+msgid "This must be set on the holding company accounts only"
+msgstr "Ceci doit être paramétré au niveau des comptes de la holding seulement"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:62
+#, python-format
+msgid "Account with code %s does not exist on the Holding company."
+msgstr "Le compte %s n'existe pas dans la holding"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:380
+#, python-format
+msgid "Invalid charts, please launch the \"Consolidation: Checks\" wizard"
+msgstr "Plans comptables invalides, veuillez lancer le \"Consolidation: Contrôle\" "
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:349
+#: code:addons/account_consolidation/wizard/consolidation_base.py:374
+#: code:addons/account_consolidation/wizard/consolidation_base.py:379
+#, python-format
+msgid "Error"
+msgstr "Erreur"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+#: view:account.consolidation.consolidate:0
+msgid "Subsidiaries to Consolidate"
+msgstr "Filiales à consolider"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Charts 1"
+msgstr "Plans comptables Contrôle1"
+
+#. module: account_consolidation
+#: selection:account.account,consolidation_mode:0
+#: selection:account.account.type,consolidation_mode:0
+msgid "YTD"
+msgstr "YTD"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Period : Check consistency of accounting periods between subsidiaries and holding company."
+msgstr "Contrôle Period : Vérifie la cohérence des périodes comptables entre les filiales et la holding"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Chart 1 : Check consistency between subsidiaries consolidation chart and Holding company chart."
+msgstr "Contrôle Plans comptables 1 : Vérifie la cohérence entre les plans comptables consolidés des filiales et le plan comptable de la holding"
+
+#. module: account_consolidation
+#: field:account.move.line,is_current_company:0
+msgid "Current company"
+msgstr "Société courante"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:207
+#, python-format
+msgid "Consolidation difference in mode %s"
+msgstr "Ecart de consolidation du mode %s "
+
+#. module: account_consolidation
+#: view:account.consolidation.consolidate:0
+msgid "Consolidate"
+msgstr "Consolide"
+
+#. module: account_consolidation
+#: constraint:account.consolidation.consolidate:0
+msgid "Start Period and End Period must be of the same Fiscal Year !"
+msgstr "La période de début et de fin doivent appartenir au même excercice comptable"
+
+#. module: account_consolidation
+#: view:account.consolidation.consolidate:0
+#: model:ir.actions.act_window,name:account_consolidation.action_consolidation_consolidate
+#: model:ir.ui.menu,name:account_consolidation.menu_consolidation_consolidate
+msgid "Consolidation: Consolidate"
+msgstr "Consolidation : Génération des écritures"
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_move
+msgid "Account Entry"
+msgstr "Ecriture"
+
+#. module: account_consolidation
+#: model:ir.ui.menu,name:account_consolidation.menu_conso_entries
+msgid "Consolidation Entries"
+msgstr "Ecritures de consolidation"
+
+#. module: account_consolidation
+#: help:res.company,consolidation_diff_account_id:0
+msgid "Conso. differences will be affected to this account"
+msgstr "Les écarts de consolidation seront passés sur ce compte "
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+msgid "Check Charts 2"
+msgstr "Plans comptables Contrôle2"
+
+#. module: account_consolidation
+#: model:ir.model,name:account_consolidation.model_account_consolidation_check
+msgid "Consolidation Checks. Model used for views"
+msgstr "Contrôle pré-consolidation. Modèle utilisé pour les vues"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_base.py:141
+#, python-format
+msgid "The fiscal year of the subsidiary company %s does not exists from %s to %s"
+msgstr "Pas excercice comptable dans la filiale %s pour les périodes de %s à %s."
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_consolidate.py:504
+#, python-format
+msgid "Consolidated Entries"
+msgstr "Ecritures de consolidation"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:52
+#: code:addons/account_consolidation/wizard/consolidation_check.py:78
+#: code:addons/account_consolidation/wizard/consolidation_check.py:103
+#, python-format
+msgid "Validation"
+msgstr "Validation"
+
+#. module: account_consolidation
+#: model:res.groups,name:account_consolidation.consolidation_user
+msgid "Consolidation user"
+msgstr "Utilisateur"
+
+#. module: account_consolidation
+#: help:account.account.type,consolidation_rate_type_id:0
+msgid "Currency rate type used on this account type for the consolidation. Leave empty to use the 'spot' rate type."
+msgstr "Type de devise utilisé pour la consolidation de ce type de compte. Laisser vide pour utiliser le taux par défaut "
+
+#. module: account_consolidation
+#: view:account.consolidation.consolidate:0
+msgid "Holding Chart of Accounts"
+msgstr "Plan comptable Holding"
+
+#. module: account_consolidation
+#: view:account.consolidation.check:0
+#: view:account.consolidation.consolidate:0
+msgid "Cancel"
+msgstr "Annuler"
+
+#. module: account_consolidation
+#: code:addons/account_consolidation/wizard/consolidation_check.py:103
+#, python-format
+msgid "All account is mapped"
+msgstr "Tout les comptes sont bien liés à des comptes consolidés"
+
+#. module: account_consolidation
+#: field:account.account,consolidation_rate_type_id:0
+#: field:account.account.type,consolidation_rate_type_id:0
+msgid "Consolidation Currency Rate Type"
+msgstr "Type de taux de devise utilisé pour la consolidation"
+
+#. module: account_consolidation
+#: field:account.consolidation.consolidate,journal_id:0
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_consolidation
+#: selection:account.consolidation.consolidate,target_move:0
+msgid "All Entries"
+msgstr "Ecritures validées + brouillon"
+
+#. module: account_consolidation
+#: model:ir.actions.act_window,name:account_consolidation.action_account_moves_all_a
+#: model:ir.model,name:account_consolidation.model_account_move_line
+#: model:ir.ui.menu,name:account_consolidation.menu_action_account_moves_all
+msgid "Journal Items"
+msgstr "Ecritures comptables"
+
 
=== modified file 'account_consolidation/wizard/consolidation_base.py'
--- account_consolidation/wizard/consolidation_base.py	2013-03-12 11:43:32 +0000
+++ account_consolidation/wizard/consolidation_base.py	2013-12-18 17:06:15 +0000
@@ -249,6 +249,61 @@
 
         return res
 
+    def check_subsidiary_mapping_account(self, cr, uid, ids, context=None):
+        """ Call the period check on each period of all subsidiaries
+        Returns the errors by subsidiary
+
+        :return: dict of list with errors for each company
+                 {company_id: ['error 1', 'error2']}
+
+        """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        assert len(ids) == 1, "only 1 id expected"
+
+        form = self.browse(cr, uid, ids[0], context=context)
+        errors_by_company = {}
+        for subsidiary in form.subsidiary_ids:
+            errors = self._check_subsidiary_mapping_account(
+                cr, uid,
+                ids,
+                subsidiary,
+                context=context)
+            if errors:
+                errors_by_company[subsidiary.id] = errors
+
+        return errors_by_company
+
+    def _check_subsidiary_mapping_account(self, cr, uid, ids,
+                                          company_id, context=None):
+        if context is None:
+            context = {}
+        errors = []
+        account_obj = self.pool.get('account.account')
+        normal_account_ids = account_obj.search(cr, uid,
+                [('company_id', '=', company_id.id),
+                 ('type', 'not in', ['consolidation', 'view'])],
+                context=context)
+        consolidated_account_ids = account_obj.search(
+                cr, uid,
+                [('company_id', '=', company_id.id),
+                 ('type', '=', 'consolidation')],
+                context=context)
+        consolidate_child_ids = []
+        for account_id in consolidated_account_ids:
+            child_consol_ids = account_obj._get_children_and_consol(
+                cr, uid, account_id, context=context)
+            consolidate_child_ids = consolidate_child_ids + child_consol_ids
+        for sub_id in normal_account_ids:
+            cpt_occur = consolidate_child_ids.count(sub_id)
+            if cpt_occur == 0 or cpt_occur > 1:
+                ## We read the code of account
+                code = account_obj.read(cr, uid, sub_id, ['code'],
+                                        context=context)['code']
+                message = _("Code %s is mapping %s times" % (code, cpt_occur))
+                errors.append(message)
+        return errors
+
     def check_subsidiary_chart(self, cr, uid, ids, holding_chart_account_id,
                                subsidiary_chart_account_id, context=None):
         """
@@ -294,8 +349,7 @@
             if not subsidiary.consolidation_chart_account_id:
                 raise osv.except_osv(
                         _('Error'),
-                        _('No chart of accounts for company %s') % subsidiary)
-
+                        _('No chart of accounts for company %s') % subsidiary.name)
             invalid_items = self.check_subsidiary_chart(
                     cr, uid,
                     ids,
 
=== modified file 'account_consolidation/wizard/consolidation_check.py'
--- account_consolidation/wizard/consolidation_check.py	2013-01-04 14:34:13 +0000
+++ account_consolidation/wizard/consolidation_check.py	2013-12-18 17:06:15 +0000
@@ -89,3 +89,28 @@
 
         raise osv.except_osv(_('Invalid periods'),
                              '\n'.join(err_lines))
+
+    def check_subsidiary_mapping_account(self, cr, uid, ids, context=None):
+        """
+        Action launched with the button on the view.
+        Check the periods and display a report of the errors
+        """
+        errors_by_company = super(
+            account_consolidation_check, self
+            ).check_subsidiary_mapping_account(cr, uid, ids, context=context)
+
+        if not errors_by_company:
+            raise osv.except_osv(_('Validation'), _('All account is mapped'))
+
+        company_obj = self.pool.get('res.company')
+
+        err_lines = []
+        for company_id, errors in errors_by_company.iteritems():
+            company = company_obj.browse(cr, uid, company_id, context=context)
+            err_lines.append(_("%s :") % company.name)
+            for error in errors:
+                err_lines.append(error)
+            err_lines.append('')
+
+        raise osv.except_osv(_('Invalid accounts'),
+                             '\n'.join(err_lines))
 
=== modified file 'account_consolidation/wizard/consolidation_check_view.xml'
--- account_consolidation/wizard/consolidation_check_view.xml	2013-01-04 15:03:23 +0000
+++ account_consolidation/wizard/consolidation_check_view.xml	2013-12-18 17:06:15 +0000
@@ -34,11 +34,19 @@
                             class="oe_highlight"/>
                         or
                         <button name="check_account_charts"
-                            string="Check Charts" type="object"
+                            string="Check Charts 1" type="object"
                             class="oe_highlight"/>
                         or
+                        <button name="check_subsidiary_mapping_account"
+                            string="Check Charts 2" type="object"
+                            class="oe_highlight"/>
                         <button string="Cancel" class="oe_link" special="cancel"/>
                     </footer>
+                    <group>
+                    <label string="Check Period : Check consistency of accounting periods between subsidiaries and holding company." />
+                    <label string="Check Chart 1 : Check consistency between subsidiaries consolidation chart and Holding company chart." />
+                    <label string="Check  Chart 2 : For each subsidiary, check consistency between the regular chart of accounts and the consolidation chart." />
+                    </group>
                 </form>
             </field>
         </record>