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

[Guewen Baconnier @ Camptocamp]

[MIGR] Migration of account_consolidation to OpenERP version 7.0

Migration of the 'account_consolidation' module.

Updated:

 * views
 * python formatting / style
 * tests
 * license changed from GPLv2 to AGPLv3

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

992 + :param fyear_id: ID of the fiscal years to compare

-> if it is a single fiscal year, then s/years/year/. Otherwise, the arg should be renamed fyear_ids.

1758 + return account.user_type.consolidation_rate_type_id

-> I think you want to return account.user_type.consolidation_rate_type_id.id (according to the original code)

review: Needs Fixing (code review, no test)

[lp:~camptocamp/account-consolidation/7.0-account_consolidation-migr]

26. By Guewen Baconnier @ Camptocamp on 2013-01-09

[FIX] unclear docstring

27. By Guewen Baconnier @ Camptocamp on 2013-01-09

[FIX] currency rate type should return an id instead of a browse record, fix the docstring as well

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

I fixed both issues.

You are right for the second one, it was a bug.

Thanks for your review!

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

OK for merge then

review: Approve

=== modified file 'account_consolidation/__openerp__.py'
--- account_consolidation/__openerp__.py	2013-01-04 10:28:46 +0000
+++ account_consolidation/__openerp__.py	2013-01-09 09:53:22 +0000
@@ -1,47 +1,49 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Guewen Baconnier (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Guewen Baconnier
+#    Copyright 2011-2013 Camptocamp SA
+#
+#    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" : "Account Consolidation",
-     "version" : "0.0",
+     "version" : "1.0",
      "author" : "Camptocamp",
+     'license': 'AGPL-3',
      "category" : "Generic Modules/Accounting",
      "description":
 """
-Account consolidation module. Coding in progress...
-
-Some explanations to do...
-
- - Difference between debit/credit is balanced on the debit/credit default account of the journal?
+Account consolidation
+=====================
+
+Introduction
+------------
+
+Consolidate chart of accounts on subsidiaries
+in a virtual chart of accounts of the holding.
+
+Installation
+------------
+The `account_reversal` module is required,
+it can be found on the account-financial-tools_
+project
+
+.. _account-financial-tools: https://launchpad.net/account-financial-tools
+
 """,
      "website": "http://www.camptocamp.com",
      "depends" : [
@@ -49,13 +51,12 @@
          'account',
          'account_reversal',
      ],
-     "init_xml" : [],
      "demo_xml" : [
          'demo/consolidation_demo.xml',
          'demo/chart_a_demo.xml',
          'demo/chart_b_demo.xml',
          ],
-     "update_xml" : [
+     "data" : [
          'company_view.xml',
          'account_view.xml',
          'wizard/consolidation_check_view.xml',
@@ -68,5 +69,5 @@
         'test/consolidation_consolidate.yml',
             ],
      "active": False,
-     "installable": False,
+     "installable": True,
 }
 
=== modified file 'account_consolidation/account.py'
--- account_consolidation/account.py	2011-08-29 14:04:57 +0000
+++ account_consolidation/account.py	2013-01-09 09:53:22 +0000
@@ -1,77 +1,71 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-#
-# Author : Guewen Baconnier (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Guewen Baconnier
+#    Copyright 2011-2013 Camptocamp SA
+#
+#    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 osv, fields
-
-
-class account_account(osv.osv):
+from openerp.osv import orm, fields
+
+
+class account_account(orm.Model):
     _inherit = 'account.account'
 
     _columns = {
-        'consolidation_rate_type_id': fields.many2one('res.currency.rate.type',
-                                                      'Consolidation Currency Rate Type',
-                                                      help="Currency rate type used on this account for the consolidation, Leave empty to use the rate type of the account type."),
-        'consolidation_mode':  fields.selection([('', ''),
-                                                 ('ytd', 'YTD'),
-                                                 ('period', 'Period Movements'),
-                                                 ],
-                                                 'Consolidation Mode'),
+        'consolidation_rate_type_id': fields.many2one(
+            'res.currency.rate.type',
+            'Consolidation Currency Rate Type',
+            help="Currency rate type used on this account "
+                 "for the consolidation. "
+                 "Leave empty to use the rate type of the account type."),
+        'consolidation_mode': fields.selection(
+            [('ytd', 'YTD'),
+             ('period', 'Period Movements')],
+            'Consolidation Mode'),
     }
 
-account_account()
-
-
-class account_account_type(osv.osv):
+
+class account_account_type(orm.Model):
     _inherit = 'account.account.type'
 
     _columns = {
-        'consolidation_rate_type_id': fields.many2one('res.currency.rate.type',
-                                                      'Consolidation Currency Rate Type',
-                                                      help="Currency rate type used on this account type for the consolidation, Leave empty to use the 'spot' rate type."),
-        'consolidation_mode':  fields.selection([('ytd', 'YTD'),
-                                                 ('period', 'Period Movements'),],
-                                                 'Consolidation Mode'),
+        'consolidation_rate_type_id': fields.many2one(
+            'res.currency.rate.type',
+            'Consolidation Currency Rate Type',
+            help="Currency rate type used on this account type "
+                 "for the consolidation. "
+                 "Leave empty to use the 'spot' rate type."),
+        'consolidation_mode': fields.selection(
+            [('ytd', 'YTD'),
+             ('period', 'Period Movements')],
+            'Consolidation Mode'),
     }
 
     _defaults = {
         'consolidation_mode': 'ytd',
     }
 
-account_account_type()
-
-
-class account_move(osv.osv):
+
+class account_move(orm.Model):
     _inherit = 'account.move'
 
     _columns = {
-        'consol_company_id': fields.many2one('res.company', 'Consolidated from Company', readonly=True),
+        'consol_company_id': fields.many2one(
+            'res.company',
+            'Consolidated from Company',
+            readonly=True),
     }
-
-account_move()
 
=== modified file 'account_consolidation/account_view.xml'
--- account_consolidation/account_view.xml	2011-08-29 14:04:57 +0000
+++ account_consolidation/account_view.xml	2013-01-09 09:53:22 +0000
@@ -9,8 +9,8 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/notebook/page[@string='General Information']/group[2]" position="after">
-                        <group col="2" colspan="2">
+                    <xpath expr="//field[@name='note']" position="after">
+                        <group>
                             <separator string="Consolidation" colspan="2"/>
                             <field name="consolidation_rate_type_id" widget="selection"/>
                             <field name="consolidation_mode"/>
@@ -20,7 +20,7 @@
                 </data>
             </field>
         </record>
-        
+
         <record id="view_account_type_consolidation_form" model="ir.ui.view">
             <field name="name">account.account.type.consolidation.form</field>
             <field name="model">account.account.type</field>
@@ -44,11 +44,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <field name="company_id" position="after">
-                    <field name="consol_company_id" attrs="{'invisible': [('consol_company_id', '=', False)]}"/>
+                    <field name="consol_company_id"
+                        attrs="{'invisible': [('consol_company_id', '=', False)]}"/>
                 </field>
             </field>
         </record>
 
     </data>
 </openerp>
-
 
=== modified file 'account_consolidation/company.py'
--- account_consolidation/company.py	2011-08-19 07:16:03 +0000
+++ account_consolidation/company.py	2013-01-09 09:53:22 +0000
@@ -1,44 +1,33 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-# All Right Reserved
-#
-# Author : Guewen Baconnier (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-##############################################################################
-
-from osv import osv, fields
-
-
-class res_company(osv.osv):
+# -* coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Guewen Baconnier
+#    Copyright 2011-2013 Camptocamp SA
+#
+#    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 openerp.osv import orm, fields
+
+
+class res_company(orm.Model):
     _inherit = 'res.company'
 
     _columns = {
-        'consolidation_chart_account_id': fields.many2one('account.account',
-                                            'Chart of Accounts for Consolidation',
-                                            domain=[('parent_id', '=', False)]),
+        'consolidation_chart_account_id': fields.many2one(
+            'account.account',
+            'Chart of Accounts for Consolidation',
+            domain=[('parent_id', '=', False)]),
     }
-
-res_company()
 
=== modified file 'account_consolidation/demo/consolidation_demo.xml'
--- account_consolidation/demo/consolidation_demo.xml	2012-04-18 14:35:42 +0000
+++ account_consolidation/demo/consolidation_demo.xml	2013-01-09 09:53:22 +0000
@@ -183,7 +183,7 @@
             <field name="company_id" ref="subsidiary_a"/>
         </record>
 
-       <record id="period_b_1" model="account.period">
+        <record id="period_b_1" model="account.period">
             <field eval="'01/'+time.strftime('%Y')" name="code"/>
             <field eval="'01/'+time.strftime('%Y')" name="name"/>
             <field eval="True" name="special"/>
@@ -292,25 +292,23 @@
             <field name="company_id" ref="subsidiary_b"/>
         </record>
 
-		<record id="account_journal_sale0" model="account.journal">
-			<field name="code">SALE</field>
-			<field name="name">SALE</field>
-			<field name="view_id" ref="account.account_sp_journal_view"/>
-			<field name="company_id" ref="account_consolidation.subsidiary_a"/>
-			<field name="sequence_id" ref="account.sequence_sale_journal"/>
-			<field eval="1" name="allow_date"/>
-			<field name="type">sale</field>
-		</record>
+        <record id="account_journal_sale0" model="account.journal">
+            <field name="code">SALE</field>
+            <field name="name">SALE</field>
+            <field name="company_id" ref="account_consolidation.subsidiary_a"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field eval="1" name="allow_date"/>
+            <field name="type">sale</field>
+        </record>
 
-		<record id="account_journal_sale1" model="account.journal">
-			<field name="code">SALE</field>
-			<field name="name">SALE</field>
-			<field name="view_id" ref="account.account_sp_journal_view"/>
-			<field name="company_id" ref="account_consolidation.subsidiary_b"/>
-			<field name="sequence_id" ref="account.sequence_sale_journal"/>
-			<field eval="1" name="allow_date"/>
-			<field name="type">sale</field>
-		</record>
+        <record id="account_journal_sale1" model="account.journal">
+            <field name="code">SALE</field>
+            <field name="name">SALE</field>
+            <field name="company_id" ref="account_consolidation.subsidiary_b"/>
+            <field name="sequence_id" ref="account.sequence_sale_journal"/>
+            <field eval="1" name="allow_date"/>
+            <field name="type">sale</field>
+        </record>
 
     </data>
 </openerp>
 
=== modified file 'account_consolidation/test/consolidation_checks.yml'
--- account_consolidation/test/consolidation_checks.yml	2011-08-19 13:08:01 +0000
+++ account_consolidation/test/consolidation_checks.yml	2013-01-09 09:53:22 +0000
@@ -42,7 +42,8 @@
         raise
 
 -
-  In order to test the consolidation checks on misconfigured periods, I use the wizard on FY2012
+  In order to test the consolidation checks on misconfigured periods, I use the wizard on the next year
+  which is misconfigured
 -
   !record {model: account.consolidation.check, id: conso_check_period_1}:
     fiscalyear_id: account_fiscalyear_fy0
@@ -79,8 +80,8 @@
     name: Virtual Account Spare
     parent_id: account_consolidation.virtual_chart_subsidiary_a
     type: consolidation
-    user_type: account.account_type_expense
-    
+    user_type: account.data_account_type_expense
+
 -
   In order to test the consolidation checks on misconfigured charts, I use the wizard
 -
 
=== modified file 'account_consolidation/test/test_data.yml'
--- account_consolidation/test/test_data.yml	2011-08-19 13:08:01 +0000
+++ account_consolidation/test/test_data.yml	2013-01-09 09:53:22 +0000
@@ -3,14 +3,14 @@
 -
   !record {model: account.move, id: account_move_0}:
     company_id: subsidiary_b
-    date: '2011-01-02'
+    date: !eval "'%s-01-02' % datetime.now().year"
     journal_id: account_journal_sale1
     line_id:
       - company_id: subsidiary_b
         account_id: a_sale_b
         amount_currency: 0.0
         credit: 0.0
-        date: '2011-01-01'
+        date: !eval "'%s-01-02' % datetime.now().year"
         debit: 1240.0
         journal_id: account_journal_sale1
         name: Entry 0
@@ -22,7 +22,7 @@
         account_id: cog_b
         amount_currency: 0.0
         credit: 1240.0
-        date: '2011-01-01'
+        date: !eval "'%s-01-02' % datetime.now().year"
         debit: 0.0
         journal_id: account_journal_sale1
         name: Entry 0
@@ -40,14 +40,14 @@
 -
   !record {model: account.move, id: account_move_1}:
     company_id: account_consolidation.subsidiary_a
-    date: '2011-01-20'
+    date: !eval "'%s-01-20' % datetime.now().year"
     journal_id: account_journal_sale0
     line_id:
       - account_id: account_consolidation.a_sale_a
         amount_currency: 0.0
         company_id: account_consolidation.subsidiary_a
         credit: 0.0
-        date: '2011-01-20'
+        date: !eval "'%s-01-20' % datetime.now().year"
         debit: 40.0
         journal_id: account_journal_sale0
         name: Entry 1
@@ -59,7 +59,7 @@
         amount_currency: 0.0
         company_id: account_consolidation.subsidiary_a
         credit: 40.0
-        date: '2011-01-20'
+        date: !eval "'%s-01-20' % datetime.now().year"
         debit: 0.0
         journal_id: account_journal_sale0
         name: Entry 1
@@ -77,14 +77,14 @@
 -
   !record {model: account.move, id: account_move_2}:
     company_id: account_consolidation.subsidiary_a
-    date: '2011-02-23'
+    date: !eval "'%s-02-23' % datetime.now().year"
     journal_id: account_journal_sale0
     line_id:
       - account_id: account_consolidation.a_sale_a
         amount_currency: 0.0
         company_id: account_consolidation.subsidiary_a
         credit: 0.0
-        date: '2011-02-01'
+        date: !eval "'%s-02-23' % datetime.now().year"
         debit: 200.0
         journal_id: account_journal_sale0
         name: Entry 2
@@ -96,7 +96,7 @@
         amount_currency: 0.0
         company_id: account_consolidation.subsidiary_a
         credit: 200.0
-        date: '2011-02-01'
+        date: !eval "'%s-02-23' % datetime.now().year"
         debit: 0.0
         journal_id: account_journal_sale0
         name: Entry 2
@@ -114,14 +114,14 @@
 -
   !record {model: account.move, id: account_move_3}:
     company_id: account_consolidation.subsidiary_a
-    date: '2011-01-15'
+    date: !eval "'%s-01-15' % datetime.now().year"
     journal_id: account_journal_sale0
     line_id:
       - account_id: account_consolidation.cog_a
         amount_currency: 0.0
         company_id: account_consolidation.subsidiary_a
         credit: 300.0
-        date: '2011-01-01'
+        date: !eval "'%s-01-15' % datetime.now().year"
         debit: 0.0
         journal_id: account_journal_sale0
         name: Entry 3
@@ -133,7 +133,7 @@
         amount_currency: 0.0
         company_id: account_consolidation.subsidiary_a
         credit: 0.0
-        date: '2011-01-01'
+        date: !eval "'%s-01-15' % datetime.now().year"
         debit: 300.0
         journal_id: account_journal_sale0
         name: Entry 3
@@ -150,94 +150,94 @@
   Creating a account.fiscalyear record with a missing period for january
 -
   !record {model: account.fiscalyear, id: account_fiscalyear_fy0}:
-    code: FY2012
+    code: !eval "'FY%s' % (datetime.now().year + 1)"
     company_id: base.main_company
-    date_start: '2012-01-01'
-    date_stop: '2012-12-31'
-    name: FY2012
+    date_start: !eval "'%s-01-01' % (datetime.now().year + 1)"
+    date_stop: !eval "'%s-12-31' % (datetime.now().year + 1)"
+    name: !eval "'FY%s' % (datetime.now().year + 1)"
     period_ids:
-      - code: 00/2012
+      - code: !eval "'00/%s' % (datetime.now().year + 1)"
         company_id: base.main_company
-        date_start: '2012-01-01'
-        date_stop: '2012-01-01'
+        date_start: !eval "'%s-01-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-01-01' % (datetime.now().year + 1)"
         name: Opening Period
         special: true
-      - code: 01/2012
-        company_id: base.main_company
-        date_start: '2012-01-01'
-        date_stop: '2012-01-31'
-        name: 01/2012
-      - code: 02/2012
-        company_id: base.main_company
-        date_start: '2012-02-01'
-        date_stop: '2012-02-29'
-        name: 02/2012
-      - code: 03/2012
-        company_id: base.main_company
-        date_start: '2012-03-01'
-        date_stop: '2012-03-31'
-        name: 03/2012
-      - code: 04/2012
-        company_id: base.main_company
-        date_start: '2012-04-01'
-        date_stop: '2012-04-30'
-        name: 04/2012
-      - code: 05/2012
-        company_id: base.main_company
-        date_start: '2012-05-01'
-        date_stop: '2012-05-31'
-        name: 05/2012
-      - code: 06/2012
-        company_id: base.main_company
-        date_start: '2012-06-01'
-        date_stop: '2012-06-30'
-        name: 06/2012
-      - code: 07/2012
-        company_id: base.main_company
-        date_start: '2012-07-01'
-        date_stop: '2012-07-31'
-        name: 07/2012
-      - code: 08/2012
-        company_id: base.main_company
-        date_start: '2012-08-01'
-        date_stop: '2012-08-31'
-        name: 08/2012
-      - code: 09/2012
-        company_id: base.main_company
-        date_start: '2012-09-01'
-        date_stop: '2012-09-30'
-        name: 09/2012
-      - code: 10/2012
-        company_id: base.main_company
-        date_start: '2012-10-01'
-        date_stop: '2012-10-31'
-        name: 10/2012
-      - code: 11/2012
-        company_id: base.main_company
-        date_start: '2012-11-01'
-        date_stop: '2012-11-30'
-        name: 11/2012
-      - code: 12/2012
-        company_id: base.main_company
-        date_start: '2012-12-01'
-        date_stop: '2012-12-31'
-        name: 12/2012
+      - code: !eval "'01/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-01-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-01-31' % (datetime.now().year + 1)"
+        name: !eval "'01/%s' % (datetime.now().year + 1)"
+      - code: !eval "'02/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-02-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-02-%s' % ((datetime.now().year + 1), (datetime((datetime.now().year + 1), 3, 1) - timedelta(days=1)).day)"
+        name: !eval "'02/%s' % (datetime.now().year + 1)"
+      - code: !eval "'03/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-03-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-03-31' % (datetime.now().year + 1)"
+        name: !eval "'03/%s' % (datetime.now().year + 1)"
+      - code: !eval "'04/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-04-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-04-30' % (datetime.now().year + 1)"
+        name: !eval "'04/%s' % (datetime.now().year + 1)"
+      - code: !eval "'05/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-05-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-05-31' % (datetime.now().year + 1)"
+        name: !eval "'05/%s' % (datetime.now().year + 1)"
+      - code: !eval "'06/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-06-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-06-30' % (datetime.now().year + 1)"
+        name: !eval "'06/%s' % (datetime.now().year + 1)"
+      - code: !eval "'07/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-07-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-07-31' % (datetime.now().year + 1)"
+        name: !eval "'07/%s' % (datetime.now().year + 1)"
+      - code: !eval "'08/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-08-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-08-31' % (datetime.now().year + 1)"
+        name: !eval "'08/%s' % (datetime.now().year + 1)"
+      - code: !eval "'09/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-09-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-09-30' % (datetime.now().year + 1)"
+        name: !eval "'09/%s' % (datetime.now().year + 1)"
+      - code: !eval "'10/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-10-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-10-31' % (datetime.now().year + 1)"
+        name: !eval "'10/%s' % (datetime.now().year + 1)"
+      - code: !eval "'11/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-11-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-11-30' % (datetime.now().year + 1)"
+        name: !eval "'11/%s' % (datetime.now().year + 1)"
+      - code: !eval "'12/%s' % (datetime.now().year + 1)"
+        company_id: base.main_company
+        date_start: !eval "'%s-12-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-12-31' % (datetime.now().year + 1)"
+        name: !eval "'12/%s' % (datetime.now().year + 1)"
 
 
 -
   Creating a account.fiscalyear record with a period in december but with different dates than the holding
 -
   !record {model: account.fiscalyear, id: account_fiscalyear_fy1}:
-    code: FY2012
+    code: !eval "'FY%s' % (datetime.now().year + 1)"
     company_id: account_consolidation.subsidiary_b
-    date_start: '2012-01-01'
-    date_stop: '2012-12-31'
-    name: FY2012
+    date_start: !eval "'%s-01-01' % (datetime.now().year + 1)"
+    date_stop: !eval "'%s-12-31' % (datetime.now().year + 1)"
+    name: !eval "'FY%s' % (datetime.now().year + 1)"
     period_ids:
       - code: diff_dates
         company_id: account_consolidation.subsidiary_b
-        date_start: '2012-12-15'
-        date_stop: '2012-12-31'
+        date_start: !eval "'%s-12-15' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-12-31' % (datetime.now().year + 1)"
         name: diff_dates
 
 
@@ -245,70 +245,70 @@
   Creating a account.fiscalyear record on subsidiary with a period for january (missing on holding)
 -
   !record {model: account.fiscalyear, id: account_fiscalyear_fy2}:
-    code: FY2012
+    code: !eval "'FY%s' % (datetime.now().year + 1)"
     company_id: account_consolidation.subsidiary_a
-    date_start: '2012-01-01'
-    date_stop: '2012-12-31'
-    name: FY2012
+    date_start: !eval "'%s-01-01' % (datetime.now().year + 1)"
+    date_stop: !eval "'%s-12-31' % (datetime.now().year + 1)"
+    name: !eval "'FY%s' % (datetime.now().year + 1)"
     period_ids:
-      - code: 00/2012
+      - code: !eval "'00/%s' % (datetime.now().year + 1)"
         company_id: account_consolidation.subsidiary_a
-        date_start: '2012-01-01'
-        date_stop: '2012-01-01'
+        date_start: !eval "'%s-01-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-01-01' % (datetime.now().year + 1)"
         name: Opening Period
         special: true
-      - code: 01/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-01-01'
-        date_stop: '2012-01-31'
-        name: 01/2012
-      - code: 02/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-02-01'
-        date_stop: '2012-02-29'
-        name: 02/2012
-      - code: 03/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-03-01'
-        date_stop: '2012-03-31'
-        name: 03/2012
-      - code: 04/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-04-01'
-        date_stop: '2012-04-30'
-        name: 04/2012
-      - code: 05/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-05-01'
-        date_stop: '2012-05-31'
-        name: 05/2012
-      - code: 06/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-06-01'
-        date_stop: '2012-06-30'
-        name: 06/2012
-      - code: 08/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-08-01'
-        date_stop: '2012-08-31'
-        name: 08/2012
-      - code: 09/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-09-01'
-        date_stop: '2012-09-30'
-        name: 09/2012
-      - code: 10/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-10-01'
-        date_stop: '2012-10-31'
-        name: 10/2012
-      - code: 11/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-11-01'
-        date_stop: '2012-11-30'
-        name: 11/2012
-      - code: 12/2012
-        company_id: account_consolidation.subsidiary_a
-        date_start: '2012-12-01'
-        date_stop: '2012-12-31'
-        name: 12/2012
+      - code: !eval "'01/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-01-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-01-31' % (datetime.now().year + 1)"
+        name: !eval "'01/%s' % (datetime.now().year + 1)"
+      - code: !eval "'02/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-02-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-02-%s' % ((datetime.now().year + 1), (datetime((datetime.now().year + 1), 3, 1) - timedelta(days=1)).day)"
+        name: !eval "'02/%s' % (datetime.now().year + 1)"
+      - code: !eval "'03/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-03-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-03-31' % (datetime.now().year + 1)"
+        name: !eval "'03/%s' % (datetime.now().year + 1)"
+      - code: !eval "'04/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-04-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-04-30' % (datetime.now().year + 1)"
+        name: !eval "'04/%s' % (datetime.now().year + 1)"
+      - code: !eval "'05/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-05-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-05-31' % (datetime.now().year + 1)"
+        name: !eval "'05/%s' % (datetime.now().year + 1)"
+      - code: !eval "'06/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-06-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-06-30' % (datetime.now().year + 1)"
+        name: !eval "'06/%s' % (datetime.now().year + 1)"
+      - code: !eval "'08/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-08-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-08-31' % (datetime.now().year + 1)"
+        name: !eval "'08/%s' % (datetime.now().year + 1)"
+      - code: !eval "'09/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-09-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-09-30' % (datetime.now().year + 1)"
+        name: !eval "'09/%s' % (datetime.now().year + 1)"
+      - code: !eval "'10/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-10-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-10-31' % (datetime.now().year + 1)"
+        name: !eval "'10/%s' % (datetime.now().year + 1)"
+      - code: !eval "'11/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-11-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-11-30' % (datetime.now().year + 1)"
+        name: !eval "'11/%s' % (datetime.now().year + 1)"
+      - code: !eval "'12/%s' % (datetime.now().year + 1)"
+        company_id: account_consolidation.subsidiary_a
+        date_start: !eval "'%s-12-01' % (datetime.now().year + 1)"
+        date_stop: !eval "'%s-12-31' % (datetime.now().year + 1)"
+        name: !eval "'12/%s' % (datetime.now().year + 1)"
 
=== modified file 'account_consolidation/wizard/consolidation_base.py'
--- account_consolidation/wizard/consolidation_base.py	2012-04-18 14:35:42 +0000
+++ account_consolidation/wizard/consolidation_base.py	2013-01-09 09:53:22 +0000
@@ -1,38 +1,29 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-#
-# Author : Guewen Baconnier (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Guewen Baconnier
+#    Copyright 2011-2013 Camptocamp SA
+#
+#    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 osv, fields
-from tools.translate import _
-
-
-class account_consolidation_base(osv.osv_memory):
+from openerp.osv import osv, orm, fields
+from openerp.tools.translate import _
+
+
+class account_consolidation_base(orm.AbstractModel):
     _name = 'account.consolidation.base'
     _description = 'Common consolidation wizard. Intended to be inherited'
 
@@ -40,18 +31,30 @@
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         if user.company_id:
             return user.company_id.id
-        return self.pool.get('res.company').search(cr, uid, [('parent_id', '=', False)])[0]
+        return self.pool.get('res.company').search(
+                cr, uid, [('parent_id', '=', False)])[0]
 
     _columns = {
-        'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True,
-                                         help="The checks will be done on the periods of the selected fiscal year."),
-        'company_id': fields.many2one('res.company', 'Company', required=True),
-        'holding_chart_account_id': fields.many2one('account.account',
-                                                 'Chart of Accounts',
-                                                 required=True,
-                                                 domain=[('parent_id', '=', False)]),
-        'subsidiary_ids': fields.many2many('res.company', 'account_conso_comp_rel', 'conso_id', 'company_id',
-                                           'Subsidiaries', required=True)
+        'fiscalyear_id': fields.many2one(
+            'account.fiscalyear',
+            'Fiscal Year',
+            required=True,
+            help="The checks will be done on the periods of "
+                 "the selected fiscal year."),
+        'company_id': fields.many2one(
+            'res.company', 'Company', required=True),
+        'holding_chart_account_id': fields.many2one(
+            'account.account',
+            'Chart of Accounts',
+            required=True,
+            domain=[('parent_id', '=', False)]),
+        'subsidiary_ids': fields.many2many(
+            'res.company',
+            'account_conso_comp_rel',
+            'conso_id',
+            'company_id',
+            'Subsidiaries',
+            required=True)
     }
 
     _defaults = {
@@ -62,14 +65,9 @@
         """
         On change of the company, set the chart of account and the subsidiaries
 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param company_id: ID of the selected company
-        @param context: A standard dictionary for contextual values
+        :param company_id: ID of the selected company
 
-        @return: dict of values to change
+        :return: dict of values to change
         """
         company_obj = self.pool.get('res.company')
 
@@ -82,21 +80,27 @@
 
         return {'value': result}
 
-    def check_subsidiary_periods(self, cr, uid, ids, holding_company_id, subs_company_id, fyear_id, context=None):
-        """
-        Check Subsidiary company periods vs Holding company periods and returns a list of errors
-        All the periods defined within the group must be the same (same beginning and ending dates)
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param holding_company_id: ID of the holding company
-        @param subs_company_id: ID of the subsidiary company to check
-        @param fyear_id: ID of the fiscal years to compare
-        @param context: A standard dictionary for contextual values
-
-        @return: dict of list with errors for each company {company_id: ['error 1', 'error2']}
+    def check_subsidiary_periods(self, cr, uid, ids, holding_company_id,
+                                 subs_company_id, fyear_id, context=None):
+        """ Check Subsidiary company periods vs Holding company periods and
+        returns a list of errors
+
+        The periods checked are the periods within the fiscal year of the
+        holding, and the periods of the subsidiary company in the same range of
+        time.
+
+        The fiscal year of the subsidiary is deduced from the start/stop date
+        of the holding's fiscal year.
+
+        All the periods defined within the group must have the same beginning
+        and ending dates to be valid.
+
+        :param holding_company_id: ID of the holding company
+        :param subs_company_id: ID of the subsidiary company to check
+        :param fyear_id: ID of the fiscal year of the holding.
+
+        :return: dict of list with errors for each company
+                 {company_id: ['error 1', 'error2']}
         """
         company_obj = self.pool.get('res.company')
         period_obj = self.pool.get('account.period')
@@ -108,48 +112,69 @@
         errors = []
 
         # get holding fiscal year and periods
-        holding = company_obj.browse(cr, uid, holding_company_id, context=context)
-        subsidiary = company_obj.browse(cr, uid, subs_company_id, context=context)
+        holding = company_obj.browse(
+                cr, uid, holding_company_id, context=context)
+        subsidiary = company_obj.browse(
+                cr, uid, subs_company_id, context=context)
 
-        holding_periods_ids = period_obj.search(cr, uid,
+        holding_periods_ids = period_obj.search(
+            cr, uid,
             [('company_id', '=', holding.id),
              ('fiscalyear_id', '=', holding_fiscal_year.id)],
             context=context)
-        holding_periods = period_obj.browse(cr, uid, holding_periods_ids, context=context)
+        holding_periods = period_obj.browse(
+                cr, uid, holding_periods_ids, context=context)
 
         # get subsidiary fiscal year and periods
-        subsidiary_fiscal_year = fy_obj.search(cr, uid,
+        subsidiary_fiscal_year = fy_obj.search(
+            cr, uid,
             [('company_id', '=', subsidiary.id),
              ('date_start', '=', holding_fiscal_year.date_start),
              ('date_stop', '=', holding_fiscal_year.date_stop),
-            ])
+            ],
+            context=context)
         if not subsidiary_fiscal_year:
-            errors.append(_('The fiscal year of the subsidiary company %s does not exists from %s to %s')
-            % (subsidiary.name, holding_fiscal_year.date_start, holding_fiscal_year.date_stop))
+            errors.append(
+                _('The fiscal year of the subsidiary company %s '
+                  'does not exists from %s to %s') %
+                    (subsidiary.name,
+                    holding_fiscal_year.date_start,
+                    holding_fiscal_year.date_stop))
         else:
-            subsidiary_period_ids = period_obj.search(cr, uid,
+            subsidiary_period_ids = period_obj.search(
+                cr, uid,
                 [('company_id', '=', subsidiary.id),
-                 ('fiscalyear_id', '=', subsidiary_fiscal_year[0])],  # 0 because there can be only 1 fiscal year on the same dates as the holding
+                  # 0 because there can be only 1 fiscal year
+                  # on the same dates than the holding
+                 ('fiscalyear_id', '=', subsidiary_fiscal_year[0])],
                 context=context)
-            subsidiary_periods = period_obj.browse(cr, uid, subsidiary_period_ids, context=context)
+            subsidiary_periods = period_obj.browse(
+                    cr, uid, subsidiary_period_ids, context=context)
 
-            # a holding fiscal year may have more periods than a subsidiary (a subsidiary created at the middle of the year for example)
+            # a holding fiscal year may have more periods than a subsidiary
+            # (a subsidiary created at the middle of the year for example)
             # but the reverse situation is not allowed
             if len(holding_periods) < len(subsidiary_periods):
-                errors.append(_('Holding company has less periods than the subsidiary company %s!') % (subsidiary.name,))
+                errors.append(
+                    _('Holding company has less periods than the '
+                      'subsidiary company %s!') % subsidiary.name)
 
-            # check subsidiary periods dates vs holding periods for each period of the subsidiary
+            # check subsidiary periods dates vs holding periods
+            # for each period of the subsidiary
             for subsidiary_period in subsidiary_periods:
                 period_exists = False
                 for holding_period in holding_periods:
-                    if subsidiary_period.date_start == holding_period.date_start \
-                    and subsidiary_period.date_stop == holding_period.date_stop:
-                            period_exists = True
-                            break
+                    if (subsidiary_period.date_start == holding_period.date_start and
+                            subsidiary_period.date_stop == holding_period.date_stop):
+                        period_exists = True
+                        break
                 if not period_exists:
-                    errors.append(_('Period from %s to %s not found in holding company %s')
-                    % (subsidiary_period.date_start, subsidiary_period.date_stop, holding.name))
-
+                    errors.append(
+                        _('Period from %s to %s not found '
+                          'in holding company %s') %
+                            (subsidiary_period.date_start,
+                            subsidiary_period.date_stop,
+                            holding.name))
         return errors
 
     def check_all_periods(self, cr, uid, ids, context=None):
@@ -157,24 +182,24 @@
         Call the period check on each period of all subsidiaries
         Returns the errors by subsidiary
 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param context: A standard dictionary for contextual values
-
-        @return: dict of list with errors for each company {company_id: ['error 1', 'error2']}
+        :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_periods(cr, uid, ids,
-                                              form.company_id.id,
-                                              subsidiary.id,
-                                              form.fiscalyear_id.id,
-                                              context=context)
+            errors = self.check_subsidiary_periods(
+                cr, uid,
+                ids,
+                form.company_id.id,
+                subsidiary.id,
+                form.fiscalyear_id.id,
+                context=context)
             if errors:
                 errors_by_company[subsidiary.id] = errors
 
@@ -182,24 +207,23 @@
 
     def _chart_accounts_data(self, cr, uid, ids, chart_account_id, context=None):
         """
-        Returns the list of accounts to use for the consolidation for the holding
-        or the subsidiaries. Keys of the returned dict are the account codes and
-        if the context is holding_coa, dict values are the browse instances of the accounts
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @chart_account_id: ID of the "Chart" Account for which we want the account codes
-        @param context: A standard dictionary for contextual values
-
-        @return: dict with {account codes: browse instances}
+        Returns the list of accounts to use for the consolidation
+        for the holding or the subsidiaries.
+        Keys of the returned dict are the account codes and
+        if the context is holding_coa,
+        dict values are the browse instances of the accounts
+
+        :chart_account_id: ID of the Chart of Account for which
+                           we want the account codes
+
+        :return: dict with {account codes: browse instances}
         """
-        context = context or {}
+        if context is None:
+            context = {}
         account_obj = self.pool.get('account.account')
         res = {}
-        account_ids = account_obj.\
-        _get_children_and_consol(cr, uid, chart_account_id, context=context)
+        account_ids = account_obj._get_children_and_consol(
+                cr, uid, chart_account_id, context=context)
 
         # do not consolidate chart root
         account_ids.remove(chart_account_id)
@@ -216,33 +240,37 @@
                 continue
 
             res[account.code] = {}
-            # we'll need the browse object during the "consolidate wizard" for the holding
-            res[account.code] = holding and account or True
+            # we'll need the browse object during the
+            # "consolidate wizard" for the holding
+            res[account.code] = account if holding else True
 
         return res
 
-    def check_subsidiary_chart(self, cr, uid, ids, holding_chart_account_id, subsidiary_chart_account_id, context=None):
+    def check_subsidiary_chart(self, cr, uid, ids, holding_chart_account_id,
+                               subsidiary_chart_account_id, context=None):
         """
-        Check a Holding Chart of Accounts vs a Subsidiary Virtual Chart of Accounts
+        Check a Holding Chart of Accounts vs a Subsidiary Virtual
+        Chart of Accounts
         All the accounts of the Virtual CoA must exist in the Holding CoA.
-        The Holding's CoA may hold accounts which do not exist in the Subsidiary's Virtual CoA.
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param holding_chart_account_id: ID of the "Chart" Account of the holding company
-        @param subsidiary_chart_account_id: ID of the "Chart" Account of the subsidiary company to check
-        @param context: A standard dictionary for contextual values
-
-        @return: List of accounts existing on subsidiary but no on holding COA
+        The Holding's CoA may hold accounts which do not exist
+        in the Subsidiary's Virtual CoA.
+
+        :param holding_chart_account_id: ID of the Chart of Account
+                                         of the holding company
+        :param subsidiary_chart_account_id: ID of the Chart of Account
+                                            of the subsidiary company to check
+
+        :return: List of accounts existing on subsidiary but no on holding COA
         """
-        context = context or {}
-        holding_ctx = context.copy()
-        holding_ctx.update({'holding_coa': True})
-        holding_accounts = self._chart_accounts_data(cr, uid, ids, holding_chart_account_id, context=holding_ctx)
-        subsidiary_accounts = self._chart_accounts_data(cr, uid, ids, subsidiary_chart_account_id, context=context)
-        # accounts which are configured on the subsidiary VCoA but not on the holding CoA
+        if context is None:
+            context = {}
+        holding_ctx = dict(context, holding_coa=True)
+        holding_accounts = self._chart_accounts_data(
+                cr, uid, ids, holding_chart_account_id, context=holding_ctx)
+        subsidiary_accounts = self._chart_accounts_data(
+                cr, uid, ids, subsidiary_chart_account_id, context=context)
+        # accounts which are configured on the subsidiary
+        # Virtual CoA but not on the holding CoA
         spare_accounts = [code for code
                           in subsidiary_accounts
                           if code not in holding_accounts]
@@ -250,26 +278,27 @@
 
     def check_account_charts(self, cr, uid, ids, context=None):
         """
-        Check the chart of accounts of the holding vs each virtual chart of accounts of the subsidiaries
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param context: A standard dictionary for contextual values
+        Check the chart of accounts of the holding vs
+        each virtual chart of accounts of the subsidiaries
         """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        assert len(ids) == 1, "only 1 id expected"
         form = self.browse(cr, uid, ids[0], context=context)
 
         invalid_items_per_company = {}
         for subsidiary in form.subsidiary_ids:
             if not subsidiary.consolidation_chart_account_id:
-                raise osv.except_osv(_('Error'), _('No chart of accounts for company %s') % (subsidiary,))
+                raise osv.except_osv(
+                        _('Error'),
+                        _('No chart of accounts for company %s') % subsidiary)
 
-            invalid_items = \
-            self.check_subsidiary_chart(cr, uid, ids,
-                                        form.holding_chart_account_id.id,
-                                        subsidiary.consolidation_chart_account_id.id,
-                                        context=context)
+            invalid_items = self.check_subsidiary_chart(
+                    cr, uid,
+                    ids,
+                    form.holding_chart_account_id.id,
+                    subsidiary.consolidation_chart_account_id.id,
+                    context=context)
             if any(invalid_items):
                 invalid_items_per_company[subsidiary.id] = invalid_items
 
@@ -278,25 +307,24 @@
     def run_consolidation(self, cr, uid, ids, context=None):
         """
         Proceed with all checks before launch any consolidation step
-        This is a base method intended to be inherited with the next consolidation steps
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param context: A standard dictionary for contextual values
+        This is a base method intended to be inherited with the next
+        consolidation steps
         """
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        assert len(ids) == 1, "only 1 id expected"
 
         if self.check_all_periods(cr, uid, ids, context=context):
-            raise osv.except_osv(_('Error'),
-                                 _('Invalid periods, please launch the "Consolidation: Checks" wizard'))
+            raise osv.except_osv(
+                _('Error'),
+                _('Invalid periods, please launch the '
+                  '"Consolidation: Checks" wizard'))
         if self.check_account_charts(cr, uid, ids, context=context):
-            raise osv.except_osv(_('Error'),
-                                 _('Invalid charts, please launch the "Consolidation: Checks" wizard'))
+            raise osv.except_osv(
+                _('Error'),
+                _('Invalid charts, please launch the '
+                  '"Consolidation: Checks" wizard'))
 
         # inherit to add the next steps of the reconciliation
 
         return {'type': 'ir.actions.act_window_close'}
-
-
-account_consolidation_base()
 
=== modified file 'account_consolidation/wizard/consolidation_check.py'
--- account_consolidation/wizard/consolidation_check.py	2012-04-18 14:35:42 +0000
+++ account_consolidation/wizard/consolidation_check.py	2013-01-09 09:53:22 +0000
@@ -1,109 +1,91 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-#
-# Author : Guewen Baconnier (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Guewen Baconnier
+#    Copyright 2011-2013 Camptocamp SA
+#
+#    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 osv, fields
-
-from tools.translate import _
-
-
-class account_consolidation_check(osv.osv_memory):
+from openerp.osv import osv, orm, fields
+from openerp.tools.translate import _
+
+
+class account_consolidation_check(orm.TransientModel):
     _name = 'account.consolidation.check'
     _inherit = 'account.consolidation.base'
     _description = 'Consolidation Checks. Model used for views'
 
     _columns = {
-        'subsidiary_ids': fields.many2many('res.company', 'account_conso_check_comp_rel', 'conso_id', 'company_id',
-                                            'Subsidiaries', required=True),
+        'subsidiary_ids': fields.many2many(
+            'res.company',
+            'account_conso_check_comp_rel',
+            'conso_id',
+            'company_id',
+            'Subsidiaries',
+            required=True),
     }
 
     def check_account_charts(self, cr, uid, ids, context=None):
         """
         Action launched with the button on the view.
         Check the account charts and display a report of the errors
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param context: A standard dictionary for contextual values
         """
-        invalid_items_per_company = \
-        super(account_consolidation_check, self).check_account_charts(cr, uid, ids, context=context)
-        if invalid_items_per_company:
-            err_lines = []
-            for company_id, account_codes in invalid_items_per_company.iteritems():
-                company_obj = self.pool.get('res.company')
-                company = company_obj.browse(cr, uid, company_id, context=context)
-                err_lines.append(_("%s :") % (company.name,))
-                [err_lines.append(_("Account with code %s does not exist on the Holding company.") % (account_code,))
-                                  for account_code
-                                  in account_codes]
-                err_lines.append('')
-
-            raise osv.except_osv(_('Invalid charts'),
-                                 '\n'.join(err_lines))
-
-        else:
-            raise osv.except_osv(_('Validation'), _('Chart of Accounts are OK.'))
-        # open a confirmation view ?
-        return True
+        company_obj = self.pool.get('res.company')
+        invalid_items_per_company = super(account_consolidation_check, self).\
+                check_account_charts(cr, uid, ids, context=context)
+
+        if not invalid_items_per_company:
+            raise osv.except_osv(
+                _('Validation'),
+                _('Chart of Accounts are OK.'))
+
+        err_lines = []
+        for company_id, account_codes in invalid_items_per_company.iteritems():
+            company = company_obj.browse(
+                    cr, uid, company_id, context=context)
+            err_lines.append(_("%s :") % company.name)
+            for account_code in account_codes:
+                err_lines.append(
+                    _("Account with code %s does not exist on the "
+                      "Holding company.") % account_code)
+            err_lines.append('')
+
+        raise osv.except_osv(
+            _('Invalid charts'), '\n'.join(err_lines))
 
     def check_all_periods(self, cr, uid, ids, context=None):
         """
         Action launched with the button on the view.
         Check the periods and display a report of the errors
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param context: A standard dictionary for contextual values
         """
-        errors_by_company = \
-        super(account_consolidation_check, self).check_all_periods(cr, uid, ids, context=context)
-
-        if errors_by_company:
-            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,))
-                [err_lines.append(error) for error in errors]
-                err_lines.append('')
-
-            raise osv.except_osv(_('Invalid periods'),
-                                 '\n'.join(err_lines))
-        else:
+        errors_by_company = super(account_consolidation_check, self).\
+                check_all_periods(cr, uid, ids, context=context)
+
+        if not errors_by_company:
             raise osv.except_osv(_('Validation'), _('Periods are OK.'))
-        # open a confirmation view ?
-        return True
-
-account_consolidation_check()
+
+        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 periods'),
+                             '\n'.join(err_lines))
 
=== modified file 'account_consolidation/wizard/consolidation_check_view.xml'
--- account_consolidation/wizard/consolidation_check_view.xml	2011-08-19 13:08:01 +0000
+++ account_consolidation/wizard/consolidation_check_view.xml	2013-01-09 09:53:22 +0000
@@ -2,32 +2,44 @@
 <openerp>
     <data>
 
-		<record id="view_consolidation_check_form" model="ir.ui.view">
+        <record id="view_consolidation_check_form" model="ir.ui.view">
             <field name="name">account.consolidation.check.form</field>
             <field name="model">account.consolidation.check</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Consolidation: Checks">
-			    <group col="4" colspan="6">
-                    <field name="company_id" on_change="on_change_company_id(company_id)" invisible="True"/>
-                    <field name="fiscalyear_id" domain="[('company_id', '=', company_id)]"/>
-                    <newline/>
-                    <field name="holding_chart_account_id" domain="[('company_id', '=', company_id), ('parent_id', '=', False)]"/>
-                    <separator string="Subsidiaries to Consolidate" colspan="4"/>
-                    <field name="subsidiary_ids" colspan="4" nolabel="1" required="True" domain="[('parent_id', '=', company_id)]">
-                        <tree>
-                            <field name="name"/>
-                            <field name="consolidation_chart_account_id"/>
-                        </tree>
-                    </field>
-				</group>
-				<separator colspan="4"/>
-			    <group col="3" colspan="4">
-            		<button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                    <button name="check_all_periods" string="Check Periods" colspan="1" type="object" icon="gtk-execute"/>
-                    <button name="check_account_charts" string="Check Charts" colspan="1" type="object" icon="gtk-execute"/>
-				</group>
-			</form>                
+                <form string="Consolidation: Checks" version="7.0">
+                    <label string="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."/>
+                    <group>
+                        <field name="company_id"
+                            on_change="on_change_company_id(company_id)"
+                            invisible="True"/>
+                        <field name="fiscalyear_id"
+                            domain="[('company_id', '=', company_id)]"/>
+                        <newline/>
+                        <field name="holding_chart_account_id"
+                            domain="[('company_id', '=', company_id), ('parent_id', '=', False)]"/>
+                        <separator string="Subsidiaries to Consolidate" colspan="4"/>
+                        <field name="subsidiary_ids" colspan="4" nolabel="1"
+                            required="True"
+                            domain="[('parent_id', '=', company_id)]">
+                            <tree>
+                                <field name="name"/>
+                                <field name="consolidation_chart_account_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <footer>
+                        <button name="check_all_periods"
+                            string="Check Periods" type="object"
+                            class="oe_highlight"/>
+                        or
+                        <button name="check_account_charts"
+                            string="Check Charts" type="object"
+                            class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -37,9 +49,8 @@
             <field name="res_model">account.consolidation.check</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-            <field name="help">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.</field>
             <field name="target">new</field>
         </record>
 
-	</data>
+    </data>
 </openerp>
 
=== modified file 'account_consolidation/wizard/consolidation_consolidate.py'
--- account_consolidation/wizard/consolidation_consolidate.py	2012-04-11 07:57:56 +0000
+++ account_consolidation/wizard/consolidation_consolidate.py	2013-01-09 09:53:22 +0000
@@ -1,55 +1,60 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
-# Copyright (c) 2011 Camptocamp SA (http://www.camptocamp.com)
-#
-# Author : Guewen Baconnier (Camptocamp)
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsability of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# garantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#    Author: Guewen Baconnier
+#    Copyright 2011-2013 Camptocamp SA
+#
+#    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 osv, fields
-from tools.translate import _
-from tools import safe_eval as eval
-
-class account_consolidation_consolidate(osv.osv_memory):
+from openerp.osv import orm, fields
+from openerp.tools.translate import _
+
+
+class account_consolidation_consolidate(orm.TransientModel):
     _name = 'account.consolidation.consolidate'
     _inherit = 'account.consolidation.base'
 
     _columns = {
-        'from_period_id': fields.many2one('account.period', 'Start Period', required=True,
-            help="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."),
-        'to_period_id': fields.many2one('account.period', 'End Period', required=True,
-            help="The consolidation will be done at the very last date of the selected period."),
-        'journal_id': fields.many2one('account.journal', 'Journal', required=True),
-        # not sure that we'll use them, actually using centralised counterpart journal
-#        'gain_account_id': fields.many2one('account.account', 'Gain Account', required=True,),
-#        'loss_account_id': fields.many2one('account.account', 'Loss Account', required=True,),
-        'target_move': fields.selection([('posted', 'All Posted Entries'),
-                                         ('all', 'All Entries'),
-                                        ], 'Target Moves', required=True),
-        'subsidiary_ids': fields.many2many('res.company', 'account_conso_conso_comp_rel', 'conso_id', 'company_id',
-                                            'Subsidiaries', required=True),
+        'from_period_id': fields.many2one(
+            'account.period',
+            'Start Period',
+            required=True,
+            help="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."),
+        'to_period_id': fields.many2one(
+            'account.period',
+            'End Period',
+            required=True,
+            help="The consolidation will be done at the very "
+                 "last date of the selected period."),
+        'journal_id': fields.many2one(
+            'account.journal', 'Journal', required=True),
+        'target_move': fields.selection(
+            [('posted', 'All Posted Entries'),
+             ('all', 'All Entries')],
+            'Target Moves',
+            required=True),
+        'subsidiary_ids': fields.many2many(
+            'res.company',
+            'account_conso_conso_comp_rel',
+            'conso_id',
+            'company_id',
+            string='Subsidiaries',
+            required=True),
     }
 
     _defaults = {
@@ -57,38 +62,39 @@
     }
 
     def _check_periods_fy(self, cr, uid, ids, context=None):
-        if context is None:
-            context = {}
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        assert len(ids) == 1, "only 1 id expected"
+
         form = self.browse(cr, uid, ids[0], context=context)
-        if form.from_period_id.fiscalyear_id.id != form.to_period_id.fiscalyear_id.id:
-            return False
-        return True
+        return (form.from_period_id.fiscalyear_id.id ==
+                form.to_period_id.fiscalyear_id.id)
 
     _constraints = [
-        (_check_periods_fy, 'Start Period and End Period must be of the same Fiscal Year !', ['from_period_id', 'to_period_id']),
+        (_check_periods_fy,
+         'Start Period and End Period must be of the same Fiscal Year !',
+         ['from_period_id', 'to_period_id']),
     ]
 
-    def on_change_from_period_id(self, cr, uid, ids, from_period_id, to_period_id, context=None):
-        """
-        On change of the From period, set the To period to the same period if it is empty
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param from_period_id: ID of the selected from period id
-        @param to_period_id: ID of the current from period id
-        @param context: A standard dictionary for contextual values
-
-        @return: dict of values to change
+    def on_change_from_period_id(self, cr, uid, ids, from_period_id,
+                                 to_period_id, context=None):
+        """ On change of the From period, set the To period
+        to the same period if it is empty
+
+        :param from_period_id: ID of the selected from period id
+        :param to_period_id: ID of the current from period id
+
+        :return: dict of values to change
         """
         result = {}
         period_obj = self.pool.get('account.period')
-        from_period = period_obj.browse(cr, uid, from_period_id, context=context)
+        from_period = period_obj.browse(
+                cr, uid, from_period_id, context=context)
         if not to_period_id:
             result['to_period_id'] = from_period_id
         else:
-            to_period = period_obj.browse(cr, uid, to_period_id, context=context)
+            to_period = period_obj.browse(
+                    cr, uid, to_period_id, context=context)
             if to_period.date_start < from_period.date_start:
                 result['to_period_id'] = from_period_id
 
@@ -99,97 +105,87 @@
         """
         Returns the currency rate type to use
 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param account: browse instance of account.account
-        @param context: A standard dictionary for contextual values
+        :param account: browse_record instance of account.account
 
-        @return: 'spot' or 'average'
+        :return: id of the currency rate type to use
         """
-        return account.consolidation_rate_type_id and account.consolidation_rate_type_id \
-            or account.user_type.consolidation_rate_type_id and account.user_type.consolidation_rate_type_id.id \
-            or False
+        if account.consolidation_rate_type_id:
+            return account.consolidation_rate_type_id.id
+
+        elif account.user_type.consolidation_rate_type_id:
+            return account.user_type.consolidation_rate_type_id.id
+
+        else:
+            return False
 
     def _consolidation_mode(self, cr, uid, ids, account, context=None):
         """
         Returns the consolidation mode to use
 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param account: browse instance of account.account
-        @param context: A standard dictionary for contextual values
-
-        @return: 'ytd' or 'period'
-        """
-        return account.consolidation_mode or account.user_type.consolidation_mode
-
-    def _periods_holding_to_subsidiary(self, cr, uid, ids, period_ids, subsidiary_id, context=None):
-        """
-        Returns the periods of a subsidiary company which correspond to the holding periods
-        (same beginning and ending dates)
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param period_ids: list of periods of the holding
-        @param subsidiary_id: ID of the subsidiary for which we want the period IDs
-        @param context: A standard dictionary for contextual values
-
-        @return: list of periods of the subsidiaries
+        :param account: browse instance of account.account
+
+        :return: 'ytd' or 'period'
+        """
+        return (account.consolidation_mode or
+                account.user_type.consolidation_mode)
+
+    def _periods_holding_to_subsidiary(self, cr, uid, ids, period_ids,
+                                       subsidiary_id, context=None):
+        """
+        Returns the periods of a subsidiary company which
+        correspond to the holding periods (same beginning and ending dates)
+
+        :param period_ids: list of periods of the holding
+        :param subsidiary_id: ID of the subsidiary for which
+                              we want the period IDs
+
+        :return: list of periods of the subsidiaries
         """
         period_obj = self.pool.get('account.period')
         if isinstance(period_ids, (int, long)):
             period_ids = [period_ids]
+
         subs_period_ids = []
         for period in period_obj.browse(cr, uid, period_ids, context=context):
-            subs_period_ids.extend(period_obj.search(cr, uid,
+            subs_period_ids += period_obj.search(
+                cr, uid,
                 [('date_start', '=', period.date_start),
                  ('date_stop', '=', period.date_stop),
-                 ('company_id', '=', subsidiary_id)])
-            )
+                 ('company_id', '=', subsidiary_id)],
+                context=context)
         return subs_period_ids
 
     def create_rate_difference_line(self, cr, uid, ids, move_id, context):
         """
-        Create a move line for the gain/loss currency difference
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param move_id: ID of the move
-        @param context: A standard dictionary for contextual values
-
-        @return:
+        Placeholder for creation of a move line
+        for the gain/loss currency difference
+
+        :param move_id: ID of the move
         """
 
-        pass
-
-    def consolidate_account(self, cr, uid, ids, consolidation_mode, subsidiary_period_ids, state, move_id,
+    def consolidate_account(self, cr, uid, ids, consolidation_mode,
+                            subsidiary_period_ids, state, move_id,
                             holding_account_id, subsidiary_id, context=None):
         """
         Consolidates the subsidiary account on the holding account
         Creates move lines on the move with id "move_id"
 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param consolidation_mode: consolidate by Periods or Year To Date ('period' or 'ytd')
-        @param subsidiary_period_ids: IDs of periods for which we want to sum the debit/credit
-        @param state: state of the moves to consolidate ('all' or 'posted')
-        @param move_id: ID of the move on which all the created move lines will be linked
-        @param holding_account_id: ID of the account to consolidate (on the holding), the method will find the subsidiary's corresponding account
-        @param subsidiary_id: ID of the subsidiary to consolidate
-        @param context: A standard dictionary for contextual values
+        :param consolidation_mode: consolidate by Periods or
+                                   Year To Date ('period' or 'ytd')
+        :param subsidiary_period_ids: IDs of periods for which we
+                                      want to sum the debit/credit
+        :param state: state of the moves to consolidate ('all' or 'posted')
+        :param move_id: ID of the move on which all the
+                        created move lines will be linked
+        :param holding_account_id: ID of the account to consolidate
+                                   (on the holding), the method will
+                                   find the subsidiary's corresponding account
+        :param subsidiary_id: ID of the subsidiary to consolidate
 
-        @return: list of IDs of the created move lines
+        :return: list of IDs of the created move lines
         """
+        if context is None:
+            context = {}
 
         account_obj = self.pool.get('account.account')
         move_obj = self.pool.get('account.move')
@@ -197,26 +193,27 @@
         currency_obj = self.pool.get('res.currency')
 
         move = move_obj.browse(cr, uid, move_id, context=context)
-        holding_account = account_obj.browse(cr, uid, holding_account_id, context=context)
+        holding_account = account_obj.browse(
+                cr, uid, holding_account_id, context=context)
 
-        subsidiary_account_id = account_obj.search(cr, uid,
-                                                   [('code', '=', holding_account.code),
-                                                    ('company_id', '=', subsidiary_id)],
-                                                   context=context)
+        subsidiary_account_id = account_obj.search(
+                cr, uid,
+                [('code', '=', holding_account.code),
+                 ('company_id', '=', subsidiary_id)],
+                context=context)
 
         if not subsidiary_account_id:
-            return []  # an account may exist on the holding and not in the subsidiaries, nothing to do
+            # an account may exist on the holding and not in the subsidiaries,
+            # nothing to do
+            return []
 
-        browse_ctx = context.copy()
-        browse_ctx.update({
-            'state': state,
-            'periods': subsidiary_period_ids,
-        })
-        # subsidiary_account_id[0] because only one account per company for one code is permitted
-        subs_account = account_obj.browse(cr, uid, subsidiary_account_id[0], context=browse_ctx)
+        browse_ctx = dict(context, state=state, periods=subsidiary_period_ids)
+        # 1st item because the account's code is unique per company
+        subs_account = account_obj.browse(
+                cr, uid, subsidiary_account_id[0], context=browse_ctx)
 
         vals = {
-            'name': _("Consolidation line in %s mode") % (consolidation_mode,),
+            'name': _("Consolidation line in %s mode") % consolidation_mode,
             'account_id': holding_account.id,
             'move_id': move.id,
             'journal_id': move.journal_id.id,
@@ -225,16 +222,24 @@
             'date': move.date
         }
 
-        if holding_account.company_currency_id.id != subs_account.company_currency_id.id:
-            currency_rate_type = self._currency_rate_type(cr, uid, ids, holding_account, context=context)
+        if (holding_account.company_currency_id.id ==
+                subs_account.company_currency_id.id):
+            vals.update({
+                'debit': subs_account.debit,
+                'credit': subs_account.credit,
+            })
+        else:
+            currency_rate_type = self._currency_rate_type(
+                    cr, uid, ids, holding_account, context=context)
 
-            currency_value = currency_obj.compute(cr, uid,
-                                                  holding_account.company_currency_id.id,
-                                                  subs_account.company_currency_id.id,
-                                                  subs_account.balance,
-                                                  currency_rate_type_from=False,  # means spot
-                                                  currency_rate_type_to=currency_rate_type,
-                                                  context=context)
+            currency_value = currency_obj.compute(
+                    cr, uid,
+                    holding_account.company_currency_id.id,
+                    subs_account.company_currency_id.id,
+                    subs_account.balance,
+                    currency_rate_type_from=False,  # means spot
+                    currency_rate_type_to=currency_rate_type,
+                    context=context)
             vals.update({
                 'currency_id': subs_account.company_currency_id.id,
                 'amount_currency': subs_account.balance,
@@ -242,72 +247,73 @@
                 'credit': currency_value < 0 and -currency_value or 0.0
             })
 
-        else:
-            vals.update({
-                'debit': subs_account.debit,
-                'credit': subs_account.credit,
-            })
-
         move_line_id = move_line_obj.create(cr, uid, vals, context=context)
 
         return move_line_id
 
-    def reverse_moves(self, cr, uid, ids, subsidiary_id, journal_id, reversal_date, context):
+    def reverse_moves(self, cr, uid, ids, subsidiary_id, journal_id,
+                      reversal_date, context=None):
         """
-        Reverse all account moves of a journal which have the "To be reversed" flag
-
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param subsidiary_id: ID of the subsidiary moves to reverse
-        @param journal_id: ID of the journal with moves to reverse
-        @param reversal_date: date when to create the reversal
-        @param context: A standard dictionary for contextual values
-
-        @return: tuple with : list of IDs of the reversed moves, list of IDs of the reversal moves
+        Reverse all account moves of a journal which have
+        the "To be reversed" flag
+
+        :param subsidiary_id: ID of the subsidiary moves to reverse
+        :param journal_id: ID of the journal with moves to reverse
+        :param reversal_date: date when to create the reversal
+
+        :return: tuple with : list of IDs of the reversed moves,
+                              list of IDs of the reversal moves
         """
         move_obj = self.pool.get('account.move')
-        reversed_ids = move_obj.search(cr, uid,
-                                       [('journal_id', '=', journal_id),
-                                        ('to_be_reversed', '=', True),
-                                        ('consol_company_id', '=', subsidiary_id)],
-                                       context=context)
-        reversal_ids = move_obj.create_reversals(cr, uid, reversed_ids, reversal_date, context=context)
+        reversed_ids = move_obj.search(
+                cr, uid,
+                [('journal_id', '=', journal_id),
+                 ('to_be_reversed', '=', True),
+                 ('consol_company_id', '=', subsidiary_id)],
+                context=context)
+        reversal_ids = move_obj.create_reversals(
+                cr, uid, reversed_ids, reversal_date, context=context)
         return reversed_ids, reversal_ids
 
-    def consolidate_subsidiary(self, cr, uid, ids, subsidiary_id, context=None):
+    def consolidate_subsidiary(self, cr, uid, ids,
+                               subsidiary_id, context=None):
         """
         Consolidate one subsidiary on the Holding.
         Create a move per subsidiary and consolidation type (YTD/Period)
         and an move line per account of the subsidiary
-        Plus a move line for the currency gain / loss  # FIXME to check!
-            
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param subsidiary_id: ID of the subsidiary to consolidate on the holding
-        @param context: A standard dictionary for contextual values
-
-        @return: Tuple of (list of IDs of the YTD moves, list of IDs of the Period Moves)
+
+        :param subsidiary_id: ID of the subsidiary to consolidate
+                              on the holding
+
+        :return: Tuple of form:
+                 (list of IDs of the YTD moves,
+                  list of IDs of the Period Moves)
         """
-
-        context = context or {}
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        assert len(ids) == 1, "only 1 id expected"
+
         company_obj = self.pool.get('res.company')
         move_obj = self.pool.get('account.move')
         period_obj = self.pool.get('account.period')
+
         form = self.browse(cr, uid, ids[0], context=context)
         subsidiary = company_obj.browse(cr, uid, subsidiary_id, context=None)
 
-        data_ctx = context.copy()
-        data_ctx.update({'holding_coa': True})
-        holding_accounts_data = self._chart_accounts_data(cr, uid, ids,
-                                                          form.holding_chart_account_id.id,
-                                                          context=data_ctx)
-        subs_accounts_codes = self._chart_accounts_data(cr, uid, ids,
-                                                        subsidiary.consolidation_chart_account_id.id,
-                                                        context=context)
+        data_ctx = dict(context, holding_coa=True)
+        holding_accounts_data = self._chart_accounts_data(
+                cr, uid,
+                ids,
+                form.holding_chart_account_id.id,
+                context=data_ctx)
+        subs_accounts_codes = self._chart_accounts_data(
+                cr, uid,
+                ids,
+                subsidiary.consolidation_chart_account_id.id,
+                context=context)
         holding_accounts = [values for key, values
                             in holding_accounts_data.iteritems()
                             if key in subs_accounts_codes]
@@ -316,12 +322,14 @@
         # a move per type will be created
         consolidation_modes = {'ytd': [], 'period': []}
         for account in holding_accounts:
-            cm = self._consolidation_mode(cr, uid, ids, account, context=context)
+            cm = self._consolidation_mode(
+                    cr, uid, ids, account, context=context)
             consolidation_modes[cm].append(account)
 
-        period_ids = period_obj.build_ctx_periods(cr, uid,
-                                                  form.from_period_id.id,
-                                                  form.to_period_id.id)
+        period_ids = period_obj.build_ctx_periods(
+                cr, uid,
+                form.from_period_id.id,
+                form.to_period_id.id)
 
         generic_move_vals = {
             'journal_id': form.journal_id.id,
@@ -337,15 +345,18 @@
 
             # get list of periods for which we have to create a move
             # in period mode : a move per period
-            # in ytd mode : a move at the last period (which will contains lines from 1st january to last period)
-            move_period_ids = consolidation_mode == 'period' \
-                              and period_ids \
-                              or [form.to_period_id.id]
+            # in ytd mode : a move at the last period
+            # (which will contains lines from 1st january to last period)
+            move_period_ids = (period_ids
+                                if consolidation_mode == 'period'
+                                else [form.to_period_id.id])
 
             for move_period_id in move_period_ids:
-                period = period_obj.browse(cr, uid, move_period_id, context=context)
+                period = period_obj.browse(
+                        cr, uid, move_period_id, context=context)
 
-                # in ytd we compute the amount from the first day of the fiscal year
+                # in ytd we compute the amount from the first
+                # day of the fiscal year
                 # in period, only for the period
                 if consolidation_mode == 'ytd':
                     date_from = period.fiscalyear_id.date_start
@@ -353,50 +364,51 @@
                     date_from = period.date_start
                 date_to = period.date_stop
 
-                period_ctx = context.copy()
-                period_ctx.update({
-                    'company_id': subsidiary.id,
-                })
-                compute_from_period_id = period_obj.find(cr, uid, date_from, context=period_ctx)[0]
-                compute_to_period_id = period_obj.find(cr, uid, date_to, context=period_ctx)[0]
-                compute_period_ids = period_obj.build_ctx_periods(cr, uid,
-                                                          compute_from_period_id,
-                                                          compute_to_period_id)
+                period_ctx = dict(context, company_id=subsidiary.id)
+                compute_from_period_id = period_obj.find(
+                        cr, uid, date_from, context=period_ctx)[0]
+                compute_to_period_id = period_obj.find(
+                        cr, uid, date_to, context=period_ctx)[0]
+                compute_period_ids = period_obj.build_ctx_periods(
+                        cr, uid,
+                        compute_from_period_id,
+                        compute_to_period_id)
 
                 # reverse previous entries with flag 'to_be_reversed' (YTD)
-                self.reverse_moves(cr, uid, ids, subsidiary.id, form.journal_id.id, date_to, context=context)
-
-                # TODO if moves found for the same period : skip ?
+                self.reverse_moves(
+                        cr, uid,
+                        ids,
+                        subsidiary.id,
+                        form.journal_id.id,
+                        date_to,
+                        context=context)
 
                 # create the account move
                 # at the very last date of the end period
-                move_vals = generic_move_vals.copy()
-                move_vals.update({
-                    'ref': _("Consolidation %s") % (consolidation_mode,),
-                    'period_id': period.id,
-                    'date': period.date_stop,
-                })
+                move_vals = dict(
+                        generic_move_vals,
+                        ref=_("Consolidation %s") % consolidation_mode,
+                        period_id=period.id,
+                        date=period.date_stop)
                 move_id = move_obj.create(cr, uid, move_vals, context=context)
 
                 move_line_ids = []
                 # create a move line per account
                 for account in accounts:
                     move_line_ids.append(
-                        self.consolidate_account(cr, uid, ids,
-                                             consolidation_mode,
-                                             compute_period_ids,
-                                             form.target_move,
-                                             move_id,
-                                             account.id,
-                                             subsidiary.id,
-                                             context=context)
+                        self.consolidate_account(
+                            cr, uid, ids,
+                            consolidation_mode,
+                            compute_period_ids,
+                            form.target_move,
+                            move_id,
+                            account.id,
+                            subsidiary.id,
+                            context=context)
                     )
 
-                # TODO calculate currency rate difference (all move lines debit - all move lines credit) and post a move line
-                # on the gain / loss account
-                # will works IF : counterparts are always configured with the same mode (YTD/Periods)
-                self.create_rate_difference_line(cr, uid, ids,
-                                                 move_id, context=context)
+                self.create_rate_difference_line(
+                        cr, uid, ids, move_id, context=context)
 
                 locals()[consolidation_mode + '_move_ids'].append(move_id)
 
@@ -407,15 +419,10 @@
         Consolidate all selected subsidiaries Virtual Chart of Accounts
         on the Holding Chart of Account
 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of the wizard IDs (commonly the first element is the current ID)
-        @param context: A standard dictionary for contextual values
-
-        @return: dict to open an Entries view filtered on the created moves
+        :return: dict to open an Entries view filtered on the created moves
         """
-        super(account_consolidation_consolidate, self).run_consolidation(cr, uid, ids, context=context)
+        super(account_consolidation_consolidate, self).run_consolidation(
+                cr, uid, ids, context=context)
 
         mod_obj = self.pool.get('ir.model.data')
         act_obj = self.pool.get('ir.actions.act_window')
@@ -425,20 +432,23 @@
         move_ids = []
         ytd_move_ids = []
         for subsidiary in form.subsidiary_ids:
-            new_move_ids = self.consolidate_subsidiary(cr, uid, ids, subsidiary.id, context=context)
-            ytd_move_ids.extend(new_move_ids[0])
-            move_ids.extend(sum(new_move_ids, []))
+            new_move_ids = self.consolidate_subsidiary(
+                    cr, uid, ids, subsidiary.id, context=context)
+            ytd_move_ids += new_move_ids[0]
+            move_ids += sum(new_move_ids, [])
 
         # YTD moves have to be reversed on the next consolidation
-        move_obj.write(cr, uid, ytd_move_ids, {'to_be_reversed': True}, context=context)
+        move_obj.write(
+                cr, uid,
+                ytd_move_ids,
+                {'to_be_reversed': True},
+                context=context)
 
         context.update({'move_ids': move_ids})
-        action_ref = mod_obj.get_object_reference(cr, uid, 'account', 'action_move_journal_line')
-        action_id = action_ref and action_ref[1] or False
+        __, action_id = mod_obj.get_object_reference(
+                cr, uid, 'account', 'action_move_journal_line')
         action = act_obj.read(cr, uid, [action_id], context=context)[0]
         action['domain'] = unicode([('id', 'in', move_ids)])
         action['name'] = _('Consolidated Entries')
         action['context'] = unicode({'search_default_to_be_reversed': 0})
         return action
-
-account_consolidation_consolidate()
 
=== modified file 'account_consolidation/wizard/consolidation_consolidate_view.xml'
--- account_consolidation/wizard/consolidation_consolidate_view.xml	2011-08-29 05:45:40 +0000
+++ account_consolidation/wizard/consolidation_consolidate_view.xml	2013-01-09 09:53:22 +0000
@@ -2,39 +2,49 @@
 <openerp>
     <data>
 
-		<record id="view_consolidation_consolidate_form" model="ir.ui.view">
+        <record id="view_consolidation_consolidate_form" model="ir.ui.view">
             <field name="name">account.consolidation.consolidate.form</field>
             <field name="model">account.consolidation.consolidate</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Consolidation: Consolidate">
-			    <group col="4" colspan="6">
-                    <field name="company_id" on_change="on_change_company_id(company_id)" invisible="True"/>
-                    <field name="fiscalyear_id" invisible="True"/>
-                    <field name="from_period_id" on_change="on_change_from_period_id(from_period_id, to_period_id)" domain="[('company_id', '=', company_id)]"/>
-                    <field name="to_period_id" domain="[('company_id', '=', company_id)]"/>
-                    <field name="journal_id" domain="[('company_id', '=', company_id)]"/>
-                    <field name="target_move"/>
-                    <separator string="Holding Chart of Accounts" colspan="4"/>
-                    <field name="holding_chart_account_id" domain="[('company_id', '=', company_id), ('parent_id', '=', False)]"/>
+                <form string="Consolidation: Consolidate" version="7.0">
+                    <label string="Run the consolidation for the selected periods and subsidiaries."/>
+                    <group>
+                        <field name="company_id"
+                            on_change="on_change_company_id(company_id)"
+                            invisible="True"/>
+                        <field name="fiscalyear_id" invisible="True"/>
+                        <field name="from_period_id"
+                            on_change="on_change_from_period_id(from_period_id, to_period_id)"
+                            domain="[('company_id', '=', company_id)]"/>
+                        <field name="to_period_id"
+                            domain="[('company_id', '=', company_id)]"/>
+                        <field name="journal_id"
+                            domain="[('company_id', '=', company_id)]"/>
+                        <field name="target_move"/>
+                        <separator string="Holding Chart of Accounts" colspan="4"/>
+                        <field name="holding_chart_account_id"
+                            domain="[('company_id', '=', company_id), ('parent_id', '=', False)]"/>
 
-                    <!--<separator string="Consolidation Difference Accounts" colspan="4"/>-->
-                    <!--<field name="gain_account_id" domain="[('type','&lt;&gt;','view'), ('id', 'child_of', [holding_chart_account_id])]"/>-->
-                    <!--<field name="loss_account_id" domain="[('type','&lt;&gt;','view'), ('id', 'child_of', [holding_chart_account_id])]"/>-->
-                    <separator string="Subsidiaries to Consolidate" colspan="4"/>
-                    <field name="subsidiary_ids" colspan="4" nolabel="1" required="True">
-                        <tree>
-                            <field name="name"/>
-                            <field name="consolidation_chart_account_id"/>
-                        </tree>
-                    </field>
-				</group>
-				<separator colspan="4"/>
-			    <group col="2" colspan="4">
-            		<button special="cancel" string="Cancel" icon='gtk-cancel'/>
-                    <button name="run_consolidation" string="Consolidate" colspan="1" type="object" icon="gtk-execute"/>
-				</group>
-			</form>
+                        <separator string="Subsidiaries to Consolidate" colspan="4"/>
+                        <field name="subsidiary_ids" colspan="4"
+                            nolabel="1" required="True">
+                            <tree>
+                                <field name="name"/>
+                                <field name="consolidation_chart_account_id"/>
+                            </tree>
+                        </field>
+                    </group>
+                    <separator colspan="4"/>
+                    <footer>
+                        <button name="run_consolidation"
+                            string="Consolidate"
+                            type="object"
+                            class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel"/>
+                    </footer>
+                </form>
             </field>
         </record>
 
@@ -44,9 +54,8 @@
             <field name="res_model">account.consolidation.consolidate</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-            <field name="help">Run the consolidation for the selected periods and subsidiaries.</field>
             <field name="target">new</field>
         </record>
 
-	</data>
+    </data>
 </openerp>