Merge lp:~pexego/account-financial-tools/adding_account_tools_from_extra_addons_to into lp:~account-core-editors/account-financial-tools/6.1

[Omar (Pexego)]

Moving pxgo_account_admin_tools, account_renumber and account_chart_update from extra-addons with small improvements:

pxgo_account_admin_tools renamed to account_admin_tools
pxgo_account_admin_tools and account_renumber ported to 6.1
PEP8

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

Dear Omar,

First of all thank you for your contribution on this project ! Happy to see them landing here. I have analyzed your module here, more from a functional / features point of view, rather than technical, but still I have some remarks:

 * account_chart_update : Seems the right place to land. The menu where it stands is good for me as it'll be the same people that will use it than the one who will create the account chart.

 * account_renumber : Seems useful in some cases for an administrator of the system, but it could definitely be dangerous for a lambda user. Move number are now related to invoice when they're issue by them. So using this by a non-administrator could lead to dangerous result. I would really prefer to have the menu entry in the administration menu for that purpose.

 * account_admin_tools : On this one, my opinion is that the import feature (for both account and move) should be made in a new module. No need to mix accounting importation features with the "repair" tools. Then, for the repair tools, as far as I can see, it's more repair tools used on past version (I say version 5.0 probably, but I'm may be wrong). Most of the provided features (but may be not all) are a bit obsolete from my point of view.

What I would suggest to you if, you agree, is to:

 * Make a merge proposal for both account_chart_update and account_renumber and moving the menu entry

 * Extract the importation tool form the account_admin_tools in a new module and make a MP for it in this project

 * For the remaining "check and repair" tools, may be we need opinion from others as well. On my side, I don't think it's a good module to include here. Or at least not with the current included feature.

Other comments welcome here. We also said that serie 6.1 should include old modules, so if you think I'm to "hard" here, please let me know. For now, I put my vote on disapprove, but I'm open to discussion here.

In any case, thank you for your MP !

Regards,

Joël

review: Disapprove

[Santi Argüeso(Pexego) (santiago-pexego)]

Just a little explanation:

The case of account_renumber is something special. In spanish localization, move number is not related to invoice number and is normal for accountants renumber theses moves ata the end of the period of year . So i think we have a conflict here. I'm not sure wich could be the best solution, maybe Include this module in spanish localization if you think that is not usefull for other accounting sistems

I totally agree with you about account_admin_tools, but for 6.1 i think is not a god idea split it into 2 modules. For sure it must be done for 7.0 and remove check and repair functionality

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

Hi Santi,

Thanks for the explanation on account_renumber. An easy solution will be to put the default menu in Administration and add one in your spanish localization in the account section, what do you think ?

For the account_admin_tools, you still using those "repair and check" fixes on version 6.1 ? Having a look on LP show that those trouble was discussed in 2010 and I can't remember that we face it in v6.1.

I don't want to be to restrictive, but honestly, I don't want to include a module in which we have >70% of the code that will not be used, what do you think ?

Other though here ?

Regards,

Joël

[Santi Argüeso(Pexego) (santiago-pexego)]

Hi Joël,

First of all, thanks a lot for your incredible work.

We can do what you propose for account_renumber. That's a good idea.

And yes, I think we are not using this tools in v6.1. I can not say if anybody use it (anyone?) but we can do what you propose, we can live with this. I don't think at all you are being restrictive, you are doing the best for all community to have a good set of modules. Thanks again.

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

Hi Santi,

So, I mark this merge as rejected to have a better visibility. We start to have quite a lot a review to do ;) Don't hesitate to resubmit.

Thanks for your understanding, have a nice end of year !

Regards,

Joël

Unmerged revisions

=== added directory 'account_admin_tools'
=== added file 'account_admin_tools/__init__.py'
--- account_admin_tools/__init__.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/__init__.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+
+"""
+Account Admin Tools
+"""
+
+__author__ = "Borja López Soilán (Pexego)"
+
+import account_importer
+import account_move_importer
+import account_chart_checker
+import revalidate_moves
+import move_partner_account
+import set_partner_in_moves
+import set_invoice_ref_in_moves
 
=== added file 'account_admin_tools/__openerp__.py'
--- account_admin_tools/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/__openerp__.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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 Admin Tools",
+    "version": "6.1",
+    "author": "Pexego",
+    "website": "http://www.pexego.es",
+    "category": "Enterprise Specific Modules",
+    "description": """Account Tools for Administrators
+
+Import tools:
+
+- Import accounts from CSV files. This may be useful to import the initial
+  accounts into OpenERP.
+
+- Import account moves from CSV files. This may be useful to import the initial
+  balance into OpenERP.
+
+
+Check and Repair tools:
+
+- Check the Chart of Accounts for problems in its structure. This will allow
+  you to detect incoherences like the ones caused by bugs like
+  https://bugs.launchpad.net/openobject-server/+bug/581137
+  (the preordered tree [parent_left/parent_right] not matching the
+  parent-child structure [parent_id]).
+
+- Revalidate confirmed account moves so their analytic lines are regenerated.
+  This may be used to fix the data after bugs like
+  https://bugs.launchpad.net/openobject-addons/+bug/582988
+  The wizard also lets you find account moves missing their analytic lines.
+
+- Set the receivable/payable account of the partners, in moves and invoices
+  where a generic receivable/payable account was used instead.
+
+- Set the parent reference in account move lines where the receivable/payable
+  account associated with the partner was used, but a partner reference wasn't
+  set. This may fix cases where the receivable/payable amounts displayed in the
+  partner form does not match the balance of the receivable/payable accounts.
+
+- Set the reference in account moves, associated with invoices, that do not
+  have the right reference (the reference from the invoice if it was a supplier
+  invoice, or the number from the invoice if it was a customer invoice).
+  This is useful to fix the account moves after changing the invoice
+  references.
+            """,
+    "depends": [
+    'base',
+    'account',
+    ],
+    "init_xml": [],
+    "demo_xml": [],
+    "update_xml": [
+    'admin_tools_menu.xml',
+    'account_importer.xml',
+    'account_move_importer.xml',
+    'account_chart_checker.xml',
+    'revalidate_moves.xml',
+    'move_partner_account.xml',
+    'set_partner_in_moves.xml',
+    'set_invoice_ref_in_moves.xml',
+    ],
+    "installable": True,
+    'active': False
+
+}
 
=== added file 'account_admin_tools/account_chart_checker.py'
--- account_admin_tools/account_chart_checker.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_chart_checker.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,211 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Account Chart Checker Wizard
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_chart_checker_problem(osv.osv_memory):
+    """
+    A problem found in the account chart
+    """
+    _name = "account_admin_tools.account_chart_checker_problem"
+    _description = "Account Chart Problem"
+
+    _columns = {
+        'wizard_id': fields.many2one('account_admin_tools.account_chart_checker',
+                                     'Wizard', required=True, readonly=True),
+        'account_id': fields.many2one('account.account', 'Account', required=True,
+                                      readonly=True),
+        'severity': fields.selection([('informative', 'Informative'),
+                                ('low', 'Low'), ('medium', 'Medium'), ('high', 'High')],
+                                'Severity', readonly=True),
+        'problem': fields.selection([
+            ('not_parent_of_children', 'Not parent of its children'),
+            ('not_children_of_parent', 'Not children of its parent'),
+        ], 'Problem', readonly=True),
+        'description': fields.text('Description')
+    }
+
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+               context=None, count=False):
+        """
+        Redefinition of the search method (as osv_memory wizards currently
+        don't support domain filters by themselves.
+        """
+        problem_ids = super(account_chart_checker_problem, self).search(cr,
+                                                                        uid, args, offset=offset, limit=limit, order=order,
+                                                                        context=context, count=count)
+
+        for arg in args:
+            if arg[0] == 'wizard_id' and arg[1] == '=':
+                wizard_id = arg[2]
+                problems = self.browse(cr, uid, problem_ids, context=context)
+                problem_ids = [problem.id for problem in problems
+                               if problem.wizard_id.id == wizard_id]
+
+        return problem_ids
+
+
+account_chart_checker_problem()
+
+
+class account_chart_checker(osv.osv_memory):
+    """
+    Account Chart Checker
+    """
+    _name = "account_admin_tools.account_chart_checker"
+    _description = "Account Chart Checker Wizard"
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company',
+                                      required=True, readonly=True),
+        'problem_ids': fields.one2many('account_admin_tools.account_chart_checker_problem',
+                                       'wizard_id', 'Problems'),
+        'state': fields.selection([('new', 'New'), ('done', 'Done')],
+                                  'Status', readonly=True),
+    }
+
+    _defaults = {
+        'state': lambda *a: 'new',
+        'company_id': lambda self, cr, uid, context:\
+            self.pool.get('res.users').browse(cr, uid, uid,\
+                                    context).company_id.id,
+    }
+
+    def action_check(self, cr, uid, ids, context=None):
+        """
+        Checks the account chart and reports the problems it finds.
+        """
+        for wiz in self.browse(cr, uid, ids, context):
+            problems = []
+
+            account_ids = self.pool.get('account.account').search(cr,
+                                                                  uid, [], context=context)
+
+            for account in self.pool.get('account.account').browse(cr,
+                                                                   uid, account_ids, context=context):
+                self._check_parent_of_children(cr, uid, account, problems)
+                self._check_child_of_parent(cr, uid, account, problems)
+
+            self.write(cr, uid, [wiz.id], {
+                'problem_ids': [(0, 0, problem)
+                                for problem in problems] or None,
+                'state': 'done'
+            })
+
+        #
+        # Return the next view: Show the problems
+        #
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [
+            ('model', '=', 'ir.ui.view'),
+            ('module', '=', 'account_admin_tools'),
+            ('name', '=', 'account_chart_checker_problem_tree')
+        ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid,
+                                                          model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+
+        return {
+            'name': _("Problems Found in the Chart of Accounts"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account_admin_tools.account_chart_checker_problem',
+            'view_type': 'form',
+            'view_mode': 'tree',
+            'views': [(resource_id, 'tree')],
+            'domain': "[('wizard_id', '=', %s)]" % wiz.id,
+            'context': context,
+        }
+
+    def _check_parent_of_children(self, cr, uid, account, problems=[],
+                                  context=None):
+        """
+        Checks that for a parent account, every children has that account
+        as its parent.
+        """
+        query = """
+                SELECT id FROM account_account WHERE parent_left > %s
+                and parent_right < %s AND COALESCE(parent_id,0) NOT IN
+                (SELECT id FROM account_account WHERE parent_left > %s
+                and parent_right < %s) AND COALESCE(parent_id,0) != %s
+                """
+        cr.execute(query, (account.parent_left or 0, account.parent_right
+                           or 0, account.parent_left or 0, account.parent_right or 0,
+                           account.id))
+        problematic_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
+
+        for child in self.pool.get('account.account').browse(cr, uid,
+                                                             problematic_ids, context=context):
+            problems.append({
+                'problem': 'not_parent_of_children',
+                'severity': 'high',
+                'account_id': account.id,
+                'description': _('The account %d (%s) is listed as \
+                        children of %d (%s) in the preordered tree, \
+                        but its parent is %d (%s)')
+                % (child.id, child.code, account.id,
+                           account.code, child.parent_id and
+                           child.parent_id.id, child.parent_id
+                           and child.parent_id.code)
+            })
+
+    def _check_child_of_parent(self, cr, uid, account, problems=[],
+                               context=None):
+        """
+        Checks that for a child account, his parent has that account
+        in its children.
+        """
+        query = """
+                SELECT id FROM account_account WHERE parent_left < %s
+                and parent_right > %s
+                """
+        cr.execute(query, (account.parent_left or 0, account.parent_right
+                           or 0))
+        parent_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
+
+        if account.parent_id and (account.parent_id.id not in parent_ids):
+            problems.append({
+                'problem': 'not_children_of_parent',
+                'severity': 'high',
+                'account_id': account.id,
+                'description': _('The account %d (%s) is children of %d\
+                                (%s), but is not listed as its children on\
+                                the preordered tree')
+                % (account.id, account.code,
+                           account.parent_id.id, account.parent_id.code)
+            })
+        elif parent_ids and not account.parent_id:
+            problems.append({
+                'problem': 'not_children_of_parent',
+                'severity': 'high',
+                'account_id': account.id,
+                'description': _('The account %d (%s) is a top level account,\
+                        but is listed as a child on the preordered tree')
+                            % (account.id, account.code)
+            })
+
+
+account_chart_checker()
 
=== added file 'account_admin_tools/account_chart_checker.xml'
--- account_admin_tools/account_chart_checker.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_chart_checker.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_account_chart_checker_form" model="ir.ui.view">
+            <field name="name">account_chart_checker.form</field>
+            <field name="model">account_admin_tools.account_chart_checker</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Check the Chart of Accounts">
+                    <label string="This wizard will search for problems in the Chart of Accounts:" colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <label string="- It will verify that the preordered tree of accounts, that OpenERP uses to calculate the amounts, matches the parent-children structure" colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <label string="A list with the problems found (if any) will be shown afterwards." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel" states="new"/>
+                        <button string="Check" name="action_check" type="object" icon="gtk-apply" states="new"/>
+                    </group>
+
+                    <field name="state" invisible="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="account_chart_checker_problem_tree" model="ir.ui.view">
+            <field name="name">account_chart_checker_problem.tree</field>
+            <field name="model">account_admin_tools.account_chart_checker_problem</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Problems" colors="red:severity=='high';green:severity=='informative'">
+                    <field name="problem"/>
+                    <field name="severity"/>
+                    <field name="account_id"/>
+                    <field name="description"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="action_account_chart_checker" model="ir.actions.act_window">
+            <field name="name">Check the Chart of Accounts</field>
+            <field name="res_model">account_admin_tools.account_chart_checker</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_account_chart_checker_form"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_account_chart_checker"
+            parent="menu_action_account_admin_tools_repair"
+            action="action_account_chart_checker"
+            sequence="10"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/account_importer.py'
--- account_admin_tools/account_importer.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_importer.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,261 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Account Importer
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import logging
+import time
+import csv
+import base64
+import StringIO
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_importer(osv.osv_memory):
+    """
+    Account Importer
+
+    Creates accounts from a CSV file.
+
+    The CSV file lines are expected to have at least the code and name of the
+    account.
+
+    The wizard will find the account brothers (or parent) having the same
+    account code sufix, and will autocomplete the rest of the account
+    parameters (account type, reconcile, parent account...).
+
+    The CSV file lines are tested to be valid account lines using the regular
+    expresion options of the wizard.
+    """
+    _name = "account_admin_tools.account_importer"
+    _description = "Account importation wizard"
+
+    _columns = {
+        #
+        # Account move parameters
+        #
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'overwrite': fields.boolean('Overwrite', help="If the account already\
+                    exists, overwrite its name?"),
+        #
+        # Input file
+        #
+        'input_file': fields.binary('File', filters="*.csv", required=True),
+        'input_file_name': fields.char('File name', size=256),
+        'csv_delimiter': fields.char('Delimiter', size=1, required=True),
+        'csv_quotechar': fields.char('Quote', size=1, required=True),
+        'csv_code_index': fields.integer('Code field', required=True),
+        'csv_code_regexp': fields.char('Code regexp', size=32, required=True),
+        'csv_name_index': fields.integer('Name field', required=True),
+        'csv_name_regexp': fields.char('Name regexp', size=32, required=True),
+    }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context:\
+            self.pool.get('res.users').browse(cr, uid, uid,\
+                                    context).company_id.id,
+        'csv_delimiter': lambda *a: ';',
+        'csv_quotechar': lambda *a: '"',
+        'csv_code_index': lambda *a: 0,
+        'csv_name_index': lambda *a: 1,
+        'csv_code_regexp': lambda *a: r'^[0-9]+$',
+        'csv_name_regexp': lambda *a: r'^.*$',
+    }
+
+    def _find_parent_account_id(self, cr, uid, wiz, account_code, context=None):
+        """
+        Finds the parent account given an account code.
+        It will remove the last digit of the code until it finds an
+        account that matches exactly the code.
+        """
+        if len(account_code) > 0:
+            parent_account_code = account_code[:-1]
+            while len(parent_account_code) > 0:
+                account_ids = self.pool.get('account.account').search(cr,\
+                                    uid, [('code', '=', parent_account_code),
+                                    ('company_id', '=', wiz.company_id.id)
+                                ])
+                if account_ids and len(account_ids) > 0:
+                    return account_ids[0]
+                parent_account_code = parent_account_code[:-1]
+        # No parent found
+        return None
+
+    def _find_brother_account_id(self, cr, uid, wiz, account_code, context=None):
+        """
+        Finds a brother account given an account code.
+        It will remove the last digit of the code until it finds an
+        account that matches the begin of the code.
+        """
+        if len(account_code) > 0:
+            brother_account_code = account_code[:-1]
+            while len(brother_account_code) > 0:
+                account_ids = self.pool.get('account.account').search(cr,\
+                            uid, [
+                                ('code', '=like', brother_account_code + '%%'),
+                                ('company_id', '=', wiz.company_id.id)
+                            ])
+                if account_ids and len(account_ids) > 0:
+                    return account_ids[0]
+                brother_account_code = brother_account_code[:-1]
+        # No brother found
+        return None
+
+    def action_import(self, cr, uid, ids, context=None):
+        """
+        Imports the accounts from the CSV file using the options from the
+        wizard.
+        """
+        # List of the imported accounts
+        imported_account_ids = []
+
+        logger = logging.getLogger("account_importer")
+        for wiz in self.browse(cr, uid, ids, context):
+            if not wiz.input_file:
+                raise osv.except_osv(_('UserError'),\
+                                _("You need to select a file!"))
+
+            # Decode the file data
+            data = base64.b64decode(wiz.input_file)
+
+            #
+            # Read the file
+            #
+            reader = csv.reader(StringIO.StringIO(data),
+                                delimiter=str(wiz.csv_delimiter),
+                                quotechar=str(wiz.csv_quotechar))
+
+            for record in reader:
+                # Ignore short records
+                if len(record) > wiz.csv_code_index \
+                        and len(record) > wiz.csv_name_index:
+
+                    record_code = record[wiz.csv_code_index]
+                    record_name = record[wiz.csv_name_index]
+
+                    #
+                    # Ignore invalid records
+                    #
+                    if re.match(wiz.csv_code_regexp, record_code) \
+                            and re.match(wiz.csv_name_regexp, record_name):
+
+                        #
+                        # Search for the account
+                        #
+                        account_ids = self.pool.get('account.account').search(cr,\
+                                uid, [
+                                    ('code', '=', record_code),
+                                    ('company_id', '=', wiz.company_id.id)
+                                ])
+                        if account_ids:
+                            if wiz.overwrite:
+                                logger.debug("Overwriting \
+                                    account: %s %s" % (record_code,\
+                                    record_name))
+                                self.pool.get('account.account').write(cr,\
+                                    uid, account_ids, {
+                                        'name': record_name
+                                    })
+                                imported_account_ids.extend(account_ids)
+                        else:
+                            #
+                            # Find the account's parent
+                            #
+                            parent_account_id = self._find_parent_account_id(cr,\
+                                        uid, wiz, record_code)
+
+                            if not parent_account_id:
+                                logger.warning("Couldn't find a\
+                                    parent account for: %s" % record_code)
+
+                            #
+                            # Find the account's brother
+                            # (will be used as template)
+                            #
+                            brother_account_id = self._find_brother_account_id(cr,\
+                                            uid, wiz, record_code)
+
+                            if not brother_account_id:
+                                logger.warning("Couldn't find a\
+                                    brother account for: %s" % record_code)
+
+                            brother_account = self.pool.get('account.account').browse(cr, \
+                                        uid, brother_account_id)
+
+                            #
+                            # Create the new account
+                            #
+                            logger.debug("Creating new account:\
+                                %s %s" % (record_code, record_name))
+                            account_id = self.pool.get('account.account').create(cr,\
+                                    uid, {
+                                        'code': record_code,
+                                        'name': record_name,
+                                        'parent_id': parent_account_id,
+                                        'type': brother_account.type,
+                                        'user_type': brother_account.user_type.id,
+                                        'reconcile': brother_account.reconcile,
+                                        'company_id': wiz.company_id.id,
+                                        'currency_id': brother_account.currency_id.id,
+                                        'currency_mode': brother_account.currency_mode,
+                                        'active': 1,
+                                        'tax_ids': [(6, 0, [tax.id for \
+                                            tax in brother_account.tax_ids])],
+                                        'note': False,
+                                    })
+
+                            imported_account_ids.append(account_id)
+                    else:
+                        logger.warning("Invalid record format\
+                            (ignoring line): %s" % repr(record))
+                else:
+                    logger.warning("Too short record \
+                            (ignoring line): %s" % repr(record))
+
+        #
+        # Show the accounts to the user
+        #
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [
+                    ('model', '=', 'ir.ui.view'),
+                    ('module', '=', 'account'),
+                    ('name', '=', 'view_account_form')
+                ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid,\
+            model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+
+        return {
+            'name': _("Imported accounts"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.account',
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'views': [(False, 'tree'), (resource_id, 'form')],
+            'domain': "[('id', 'in', %s)]" % imported_account_ids,
+            'context': context,
+        }
+
+
+account_importer()
 
=== added file 'account_admin_tools/account_importer.xml'
--- account_admin_tools/account_importer.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_importer.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_importer_form" model="ir.ui.view">
+            <field name="name">account_importer.form</field>
+            <field name="model">account_admin_tools.account_importer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account importer">
+                    <label string="This wizard will import accounts from a CSV file." colspan="4"/>
+                    <label string="Only the account code and name are needed, the rest of the required account data will be filled based on its brother accounts (same code begining)." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <newline/>
+                    <group string="Account parameters" colspan="4">
+                        <label string="Select the parameters for the account"/>
+                        <group colspan="4">
+                            <field name="company_id"/>
+                            <field name="overwrite"/>
+                        </group>
+                    </group>
+                    <group string="Input file" colspan="4">
+                        <label string="Select the CSV file with the lines for the account move"/>
+                        <group colspan="4">
+                            <field name="input_file_name" string="File"/>
+                            <field name="input_file" filename="input_file_name" nolabel="1"/>
+                            <group colspan="2">
+                                <separator string="File format" colspan="4"/>
+                                <field name="csv_delimiter"/>
+                                <field name="csv_quotechar"/>
+                            </group>
+                            <group colspan="2">
+                                <separator string="Record format" colspan="4"/>
+                                <field name="csv_code_index"/>
+                                <field name="csv_code_regexp"/>
+                                <field name="csv_name_index"/>
+                                <field name="csv_name_regexp"/>
+                            </group>
+                        </group>
+                    </group>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Import" name="action_import" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_importer" model="ir.actions.act_window">
+            <field name="name">Import Accounts from CSV</field>
+            <field name="res_model">account_admin_tools.account_importer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_account_importer_form"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_account_importer"
+            parent="menu_action_account_admin_tools_import"
+            action="action_account_importer"
+            sequence="10"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/account_importer_wizard.py'
--- account_admin_tools/account_importer_wizard.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_importer_wizard.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,268 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Account Importer
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import time
+import csv
+import base64
+import StringIO
+import logging
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_importer_wizard(osv.osv_memory):
+    """
+    Account Importer
+
+    Creates accounts from a CSV file.
+
+    The CSV file lines are expected to have at least the code and name of the
+    account.
+
+    The wizard will find the account brothers (or parent) having the same
+    account code sufix, and will autocomplete the rest of the account
+    parameters (account type, reconcile, parent account...).
+
+    The CSV file lines are tested to be valid account lines using the regular
+    expresion options of the wizard.
+    """
+    _name = "account_importer_wizard"
+    _description = "Account importation wizard"
+
+    _columns = {
+        #
+        # Account move parameters
+        #
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'overwrite': fields.boolean('Overwrite',
+                                    help="If the account already\ exists, overwrite its name?"),
+        #
+        # Input file
+        #
+        'input_file': fields.binary('File', filters="*.csv", required=True),
+        'input_file_name': fields.char('File name', size=256),
+        'csv_delimiter': fields.char('Delimiter', size=1, required=True),
+        'csv_quotechar': fields.char('Quote', size=1, required=True),
+        'csv_code_index': fields.integer('Code field', required=True),
+        'csv_code_regexp': fields.char('Code regexp', size=32, required=True),
+        'csv_name_index': fields.integer('Name field', required=True),
+        'csv_name_regexp': fields.char('Name regexp', size=32, required=True),
+
+    }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context:
+        self.pool.get('res.users').browse(cr, uid,
+                                          uid, context).company_id.id,
+        'csv_delimiter': lambda *a: ';',
+        'csv_quotechar': lambda *a: '"',
+        'csv_code_index': lambda *a: 0,
+        'csv_name_index': lambda *a: 1,
+        'csv_code_regexp': lambda *a: r'^[0-9]+$',
+        'csv_name_regexp': lambda *a: r'^.*$',
+    }
+
+    def _find_parent_account_id(self, cr, uid, wiz, account_code, context=None):
+        """
+        Finds the parent account given an account code.
+        It will remove the last digit of the code until it finds an account that
+        matches exactly the code.
+        """
+        if len(account_code) > 0:
+            parent_account_code = account_code[:-1]
+            while len(parent_account_code) > 0:
+                account_ids = self.pool.get('account.account').search(cr, uid, [
+                    ('code', '=', parent_account_code),
+                    ('company_id', '=', wiz.company_id.id)
+                ])
+                if account_ids and len(account_ids) > 0:
+                    return account_ids[0]
+                parent_account_code = parent_account_code[:-1]
+        # No parent found
+        return None
+
+    def _find_brother_account_id(self, cr, uid, wiz, account_code, context=None):
+        """
+        Finds a brother account given an account code.
+        It will remove the last digit of the code until it finds
+        an account that matches the begin of the code.
+        """
+        if len(account_code) > 0:
+            brother_account_code = account_code[:-1]
+            while len(brother_account_code) > 0:
+                account_ids = self.pool.get('account.account').search(cr,
+                                                                      uid, [
+                                                                      ('code', '=like', brother_account_code + '%%'),
+                                           ('company_id',
+                                            '=', wiz.company_id.id)
+                                                                      ])
+                if account_ids and len(account_ids) > 0:
+                    return account_ids[0]
+                brother_account_code = brother_account_code[:-1]
+        # No brother found
+        return None
+
+    def action_import(self, cr, uid, ids, context=None):
+        """
+        Imports the accounts from the CSV file using the options from the
+        wizard.
+        """
+        # List of the imported accounts
+        imported_account_ids = []
+
+        logger = logging.getLogger("account_importer")
+        for wiz in self.browse(cr, uid, ids, context):
+            if not wiz.input_file:
+                raise osv.except_osv(_('UserError'),
+                                     _("You need to select a file!"))
+
+            # Decode the file data
+            data = base64.b64decode(wiz.input_file)
+
+            #
+            # Read the file
+            #
+            reader = csv.reader(StringIO.StringIO(data),
+                                delimiter=str(wiz.csv_delimiter),
+                                quotechar=str(wiz.csv_quotechar))
+
+            for record in reader:
+                # Ignore short records
+                if len(record) > wiz.csv_code_index \
+                        and len(record) > wiz.csv_name_index:
+
+                    record_code = record[wiz.csv_code_index]
+                    record_name = record[wiz.csv_name_index]
+
+                    #
+                    # Ignore invalid records
+                    #
+                    if re.match(wiz.csv_code_regexp, record_code) \
+                            and re.match(wiz.csv_name_regexp, record_name):
+
+                        #
+                        # Search for the account
+                        #
+                        account_ids = self.pool.get(
+                            'account.account').search(cr,
+                                                      uid, [
+                                                      ('code',
+                                                       '=', record_code),
+                                                      ('company_id',
+                                                       '=', wiz.company_id.id)
+                                                      ])
+                        if account_ids:
+                            if wiz.overwrite:
+                                logger.debug("Overwriting account: %s %s"
+                                                % (record_code, record_name))
+                                self.pool.get('account.account').write(cr,
+                                                                       uid, account_ids, {
+                                                                       'name': record_name
+                                                                       })
+                                imported_account_ids.extend(account_ids)
+                        else:
+                            #
+                            # Find the account's parent
+                            #
+                            parent_account_id = self._find_parent_account_id(
+                                cr,
+                                uid, wiz, record_code)
+
+                            if not parent_account_id:
+                                logger.warning("Couldn't find a parent\
+                                    account for: %s" % record_code)
+
+                            #
+                            # Find the account's brother (will be used as template)
+                            #
+                            brother_account_id = self._find_brother_account_id(cr,
+                                                                               uid, wiz, record_code)
+
+                            if not brother_account_id:
+                                logger.warning("Couldn't find a\
+                                    brother account for: %s" % record_code)
+
+                            brother_account = self.pool.get(
+                                'account.account').browse(cr,
+                                                          uid, brother_account_id)
+
+                            #
+                            # Create the new account
+                            #
+                            logger.debug("Creating new account:\
+                                %s %s" % (record_code, record_name))
+                            account_id = self.pool.get(
+                                'account.account').create(cr,
+                                                          uid, {
+                                                          'code': record_code,
+                                                          'name': record_name,
+                                                          'parent_id': parent_account_id,
+                                                          'type': brother_account.type,
+                                                          'user_type': brother_account.user_type.id,
+                                                          'reconcile': brother_account.reconcile,
+                                                          'company_id': wiz.company_id.id,
+                                                          'currency_id': brother_account.currency_id.id,
+                                                          'currency_mode': brother_account.currency_mode,
+                                                          'check_history': brother_account.check_history,
+                                                          'active': 1,
+                                                          'tax_ids': [(6, 0, [tax.id for tax
+                                                                              in brother_account.tax_ids])],
+                                                          'note': False,
+                                                          })
+
+                            imported_account_ids.append(account_id)
+                    else:
+                        logger.warning("Invalid record format \
+                            (ignoring line): %s" % repr(record))
+                else:
+                    logger.warning("Too short record \
+                        (ignoring line): %s" % repr(record))
+
+        #
+        # Show the accounts to the user
+        #
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid,
+                                                               [
+                                                               ('model', '=', 'ir.ui.view'),
+                                      ('module', '=', 'account'),
+                                                                   ('name', '=', 'view_account_form')
+                                                               ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid,
+                                                          model_data_ids, fields=['res_id'])[0]['res_id']
+
+        return {
+            'name': _("Imported accounts"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.account',
+            'view_type': 'form',
+            'view_mode': 'tree, form',
+            'views': [(False, 'tree'), (resource_id, 'form')],
+            'domain': "[('id', 'in', %s)]" % imported_account_ids,
+        }
+
+
+account_importer_wizard()
 
=== added file 'account_admin_tools/account_importer_wizard.xml'
--- account_admin_tools/account_importer_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_importer_wizard.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_importer_wizard_form" model="ir.ui.view">
+            <field name="name">account_importer_wizard.form</field>
+            <field name="model">account_importer_wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account importer">
+                    <label string="This wizard will import accounts from a CSV file." colspan="4"/>
+                    <label string="Only the account code and name are needed, the rest of the required account data will be filled based on its brother accounts (same code begining)." colspan="4"/>
+                    <label string=""/>
+                    <newline/>
+                    <group string="Account parameters" colspan="4">
+                        <label string="Select the parameters for the account"/>
+                        <group colspan="4">
+                            <field name="company_id"/>
+                            <field name="overwrite"/>
+                        </group>
+                    </group>
+                    <group string="Input file" colspan="4">
+                        <label string="Select the CSV file with the lines for the account move"/>
+                        <group colspan="4">
+                            <field name="input_file_name" string="File"/>
+                            <field name="input_file" filename="input_file_name" nolabel="1"/>
+                            <group colspan="2">
+                                <separator string="File format" colspan="4"/>
+                                <field name="csv_delimiter"/>
+                                <field name="csv_quotechar"/>
+                            </group>
+                            <group colspan="2">
+                                <separator string="Record format" colspan="4"/>
+                                <field name="csv_code_index"/>
+                                <field name="csv_code_regexp"/>
+                                <field name="csv_name_index"/>
+                                <field name="csv_name_regexp"/>
+                            </group>
+                        </group>
+                    </group>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Import" name="action_import" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_importer_wizard" model="ir.actions.act_window">
+            <field name="name">Import Accounts from CSV</field>
+            <field name="res_model">account_importer_wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_account_importer_wizard"
+            parent="menu_action_account_admin_tools"
+            action="action_account_importer_wizard"
+            sequence="10"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/account_move_importer.py'
--- account_admin_tools/account_move_importer.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_move_importer.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,300 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Account Move Importer
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import time
+import logging
+import csv
+import base64
+import StringIO
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_move_importer(osv.osv_memory):
+    """
+    Account Move Importer
+
+    Wizard that imports a CSV file into a new account move.
+
+    The CSV file is expected to have at least the account code, a reference
+    (description of the move line), the debit and the credit.
+
+    The lines of the CSV file are tested to be valid account move lines
+    using the regular expresions set on the wizard.
+    """
+    _name = "account_admin_tools.account_move_importer"
+    _description = "Account move importation wizard"
+
+    _columns = {
+        #
+        # Account move parameters
+        #
+        'company_id': fields.many2one('res.company', 'Company',
+                                      required=True),
+        'ref': fields.char('Ref', size=64, required=True),
+        'period_id': fields.many2one('account.period', 'Period',
+                                     required=True),
+        'journal_id': fields.many2one('account.journal', 'Journal',
+                                      required=True),
+        'date': fields.date('Date', required=True),
+        'type': fields.selection([
+            ('pay_voucher', 'Cash Payment'),
+            ('bank_pay_voucher', 'Bank Payment'),
+            ('rec_voucher', 'Cash Receipt'),
+            ('bank_rec_voucher', 'Bank Receipt'),
+            ('cont_voucher', 'Contra'),
+            ('journal_sale_vou', 'Journal Sale'),
+            ('journal_pur_voucher', 'Journal Purchase'),
+            ('journal_voucher', 'Journal Voucher'),
+        ], 'Type', select=True, required=True),
+        #
+        # Input file
+        #
+        'input_file': fields.binary('File', filters="*.csv", required=True),
+        'input_file_name': fields.char('File name', size=256),
+        'csv_delimiter': fields.char('Delimiter', size=1, required=True),
+        'csv_quotechar': fields.char('Quote', size=1, required=True),
+        'csv_decimal_separator': fields.char('Decimal sep.', size=1,
+                                             required=True),
+        'csv_thousands_separator': fields.char('Thousands sep.', size=1,
+                                               required=True),
+        'csv_code_index': fields.integer('Code field', required=True),
+        'csv_code_regexp': fields.char('Code regexp', size=32, required=True),
+        'csv_ref_index': fields.integer('Ref field', required=True),
+        'csv_ref_regexp': fields.char('Ref regexp', size=32, required=True),
+        'csv_debit_index': fields.integer('Debit field', required=True),
+        'csv_debit_regexp': fields.char('Debit regexp', size=32,
+                                        required=True),
+        'csv_credit_index': fields.integer('Credit field', required=True),
+        'csv_credit_regexp': fields.char('Credit regexp', size=32,
+                                         required=True),
+    }
+
+    def _get_default_period_id(self, cr, uid, context=None):
+        """
+        Returns the default period to use (based on account.move)
+        """
+        period_ids = self.pool.get('account.period').find(cr, uid)
+        return period_ids and period_ids[0] or False
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context:
+        self.pool.get('res.users').browse(cr, uid, uid,
+                                          context).company_id.id,
+        'period_id': _get_default_period_id,
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'type': lambda *a: 'journal_voucher',  # Based on account move
+        'csv_delimiter': lambda *a: ';',
+        'csv_quotechar': lambda *a: '"',
+        'csv_decimal_separator': lambda *a: '.',
+        'csv_thousands_separator': lambda *a: ',',
+        'csv_code_index': lambda *a: 0,
+        'csv_ref_index': lambda *a: 1,
+        'csv_debit_index': lambda *a: 2,
+        'csv_credit_index': lambda *a: 3,
+        'csv_code_regexp': lambda *a: r'^[0-9]+$',
+        'csv_ref_regexp': lambda *a: r'^.*$',
+        'csv_debit_regexp': lambda *a: r'^[0-9\-\.\,]*$',
+        'csv_credit_regexp': lambda *a: r'^[0-9\-\.\,]*$',
+    }
+
+    def _get_accounts_map(self, cr, uid, context=None):
+        """
+        Find the receivable/payable accounts that are associated with
+        a single partner and return a (account.id, partner.id) map
+        """
+        partner_ids = self.pool.get('res.partner').search(cr, uid, [],
+                                                          context=context)
+        accounts_map = {}
+        for partner in self.pool.get('res.partner').browse(cr, uid,
+                                                           partner_ids, context=context):
+            #
+            # Add the receivable account to the map
+            #
+            if accounts_map.get(partner.property_account_receivable.id,
+                                None) is None:
+                accounts_map[
+                    partner.property_account_receivable.id] = partner.id
+            else:
+                # Two partners with the same receivable account: ignore
+                # this account!
+                accounts_map[partner.property_account_receivable.id] = 0
+            #
+            # Add the payable account to the map
+            #
+            if accounts_map.get(partner.property_account_payable.id,
+                                None) is None:
+                accounts_map[partner.property_account_payable.id] = partner.id
+            else:
+                # Two partners with the same receivable account: ignore
+                # this account!
+                accounts_map[partner.property_account_payable.id] = 0
+        return accounts_map
+
+    def action_import(self, cr, uid, ids, context=None):
+        """
+        Imports a CSV file into a new account move using the options from
+        the wizard.
+        """
+        accounts_map = self._get_accounts_map(cr, uid, context=context)
+        logger = logging.getLogger("account_move_importer")
+        
+        for wiz in self.browse(cr, uid, ids, context=context):
+            if not wiz.input_file:
+                raise osv.except_osv(_('UserError'),
+                                     _("You need to select a file!"))
+
+            account_move_data = self.pool.get('account.move').default_get(cr,
+                                                                          uid, ['state', 'name'])
+            account_move_data.update({
+                'ref': wiz.ref,
+                'journal_id': wiz.journal_id.id,
+                'period_id': wiz.period_id.id,
+                'date': wiz.date,
+                'type': wiz.type,
+                'line_id': [],
+                'partner_id': False,
+                'to_check': 0
+            })
+
+            lines_data = account_move_data['line_id']
+
+            # Decode the file data
+            data = base64.b64decode(wiz.input_file)
+
+            #
+            # Read the file
+            #
+            reader = csv.reader(StringIO.StringIO(data),
+                                delimiter=str(wiz.csv_delimiter),
+                                quotechar=str(wiz.csv_quotechar))
+
+            for record in reader:
+                # Ignore short records
+                if len(record) > wiz.csv_code_index \
+                        and len(record) > wiz.csv_ref_index \
+                        and len(record) > wiz.csv_debit_index \
+                        and len(record) > wiz.csv_credit_index:
+
+                    record_code = record[wiz.csv_code_index]
+                    record_ref = record[wiz.csv_ref_index]
+                    record_debit = record[wiz.csv_debit_index]
+                    record_credit = record[wiz.csv_credit_index]
+
+                    #
+                    # Ignore invalid records
+                    #
+                    if re.match(wiz.csv_code_regexp, record_code) \
+                            and re.match(wiz.csv_ref_regexp, record_ref) \
+                            and re.match(wiz.csv_debit_regexp, record_debit) \
+                            and re.match(wiz.csv_credit_regexp, record_credit):
+                        #
+                        # Clean the input amounts
+                        #
+                        record_debit = float(record_debit.replace(wiz.csv_thousands_separator, '').replace(wiz.csv_decimal_separator, '.'))
+                        record_credit = float(record_credit.replace(wiz.csv_thousands_separator, '').replace(wiz.csv_decimal_separator, '.'))
+
+                        #
+                        # Find the account (or fail!)
+                        #
+                        account_ids = self.pool.get(
+                            'account.account').search(cr,
+                                                      uid, [
+                                                      ('code',
+                                                       '=', record_code),
+                                                      ('company_id',
+                                                       '=', wiz.company_id.id)
+                                                      ])
+                        if not account_ids:
+                            raise osv.except_osv(_('Error'), _("Account\
+                                        not found: %s!") % record_code)
+
+                        #
+                        # Prepare the line data
+                        #
+                        line_data = {
+                            'account_id': account_ids[0],
+                            'debit': 0.0,
+                            'credit': 0.0,
+                            'name': record_ref,
+                            'ref': False,
+                            'currency_id': False,
+                            'tax_amount': False,
+                            'partner_id': accounts_map.get(account_ids[0])
+                            or False,
+                            'tax_code_id': False,
+                            'date_maturity': False,
+                            'amount_currency': False,
+                            'analytic_account_id': False,
+                        }
+
+                        #
+                        # Create a debit line + a credit line if needed
+                        #
+                        line_data_debit = line_data.copy()
+                        line_data_credit = line_data
+                        if record_debit != 0.0:
+                            line_data_debit['debit'] = record_debit
+                            lines_data.append((0, 0, line_data_debit))
+                        if record_credit != 0.0:
+                            line_data_credit['credit'] = record_credit
+                            lines_data.append((0, 0, line_data_credit))
+                    else:
+                        logger.warning("Invalid record format\
+                                        (ignoring line): %s" % repr(record))
+                else:
+                    logger.warning("Too short record\
+                        (ignoring line): %s" % repr(record))
+
+        # Finally create the move
+        move_id = self.pool.get('account.move').create(cr, uid,
+                                                       account_move_data)
+
+        #
+        # Show the move to the user
+        #
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [
+            ('model', '=', 'ir.ui.view'),
+            ('module', '=', 'account'),
+            ('name', '=', 'view_move_form')
+        ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid,
+                                                          model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+
+        return {
+            'name': _("Imported account moves"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.move',
+            'view_type': 'form',
+            'view_mode': 'form, tree',
+            #'view_id': (resource_id, 'View'),
+            'views': [(False, 'tree'), (resource_id, 'form')],
+            'domain': "[('id', '=', %s)]" % move_id,
+            'context': context,
+        }
+
+account_move_importer()
 
=== added file 'account_admin_tools/account_move_importer.xml'
--- account_admin_tools/account_move_importer.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_move_importer.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_move_importer_form" model="ir.ui.view">
+            <field name="name">account_move_importer.form</field>
+            <field name="model">account_admin_tools.account_move_importer</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account move importer">
+                    <label string="This wizard will import one account move from a CSV file." colspan="4"/>
+                    <label string="Note: It will fail if any of the accounts do not exist in OpenERP." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <newline/>
+                    <group string="Account move parameters" colspan="4">
+                        <label string="Select the parameters for the account move"/>
+                        <group colspan="4">
+                            <field name="ref"/>
+                            <field name="company_id"/>
+                            <newline/>
+                            <field name="journal_id"/>
+                            <field name="type"/>
+                            <newline/>
+                            <field name="period_id"/>
+                            <field name="date"/>
+                        </group>
+                    </group>
+                    <group string="Input file" colspan="4">
+                        <label string="Select the CSV file with the lines for the account move"/>
+                        <group colspan="4">
+                            <field name="input_file_name" string="File"/>
+                            <field name="input_file" filename="input_file_name" nolabel="1"/>
+                            <group colspan="2">
+                                <separator string="File format" colspan="4"/>
+                                <field name="csv_delimiter"/>
+                                <field name="csv_quotechar"/>
+                                <field name="csv_thousands_separator"/>
+                                <field name="csv_decimal_separator"/>
+                            </group>
+                            <group colspan="2">
+                                <separator string="Record format" colspan="4"/>
+                                <field name="csv_code_index"/>
+                                <field name="csv_code_regexp"/>
+                                <field name="csv_ref_index"/>
+                                <field name="csv_ref_regexp"/>
+                                <field name="csv_debit_index"/>
+                                <field name="csv_debit_regexp"/>
+                                <field name="csv_credit_index"/>
+                                <field name="csv_credit_regexp"/>
+                            </group>
+                        </group>
+                    </group>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Import" name="action_import" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_move_importer" model="ir.actions.act_window">
+            <field name="name">Import Account Move from CSV</field>
+            <field name="res_model">account_admin_tools.account_move_importer</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_account_move_importer_form"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_account_move_importer"
+            parent="menu_action_account_admin_tools_import"
+            action="action_account_move_importer"
+            sequence="20"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/account_move_importer_wizard.py'
--- account_admin_tools/account_move_importer_wizard.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_move_importer_wizard.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,266 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Account Move Importer
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import time
+import csv
+import base64
+import logging
+import StringIO
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class account_move_importer_wizard(osv.osv_memory):
+    """
+    Account Move Importer
+
+    Wizard that imports a CSV file into a new account move.
+
+    The CSV file is expected to have at least the account code, a reference
+    (description of the move line), the debit and the credit.
+
+    The lines of the CSV file are tested to be valid account move lines
+    using the regular expresions set on the wizard.
+    """
+    _name = "account_move_importer_wizard"
+    _description = "Account move importation wizard"
+
+    _columns = {
+        #
+        # Account move parameters
+        #
+        'company_id': fields.many2one('res.company', 'Company',
+                                      required=True),
+        'ref': fields.char('Ref', size=64, required=True),
+        'period_id': fields.many2one('account.period', 'Period',
+                                     required=True),
+        'journal_id': fields.many2one('account.journal', 'Journal',
+                                      required=True),
+        'date': fields.date('Date', required=True),
+
+        'type': fields.selection([
+            ('pay_voucher', 'Cash Payment'),
+            ('bank_pay_voucher', 'Bank Payment'),
+            ('rec_voucher', 'Cash Receipt'),
+            ('bank_rec_voucher', 'Bank Receipt'),
+            ('cont_voucher', 'Contra'),
+            ('journal_sale_vou', 'Journal Sale'),
+            ('journal_pur_voucher', 'Journal Purchase'),
+            ('journal_voucher', 'Journal Voucher'),
+        ], 'Type', select=True, required=True),
+        #
+        # Input file
+        #
+        'input_file': fields.binary('File', filters="*.csv",
+                                    required=True),
+        'input_file_name': fields.char('File name', size=256),
+        'csv_delimiter': fields.char('Delimiter', size=1,
+                                     required=True),
+        'csv_quotechar': fields.char('Quote', size=1, required=True),
+        'csv_decimal_separator': fields.char('Decimal sep.', size=1,
+                                             required=True),
+        'csv_thousands_separator': fields.char('Thousands sep.', size=1,
+                                               required=True),
+        'csv_code_index': fields.integer('Code field', required=True),
+        'csv_code_regexp': fields.char('Code regexp', size=32, required=True),
+        'csv_ref_index': fields.integer('Ref field', required=True),
+        'csv_ref_regexp': fields.char('Ref regexp', size=32, required=True),
+        'csv_debit_index': fields.integer('Debit field', required=True),
+        'csv_debit_regexp': fields.char('Debit regexp', size=32,
+                                        required=True),
+        'csv_credit_index': fields.integer('Credit field', required=True),
+        'csv_credit_regexp': fields.char('Credit regexp', size=32,
+                                         required=True),
+    }
+
+    def _get_default_period_id(self, cr, uid, context=None):
+        """
+        Returns the default period to use (based on account.move)
+        """
+        period_ids = self.pool.get('account.period').find(cr, uid)
+        return period_ids and period_ids[0] or False
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context:
+        self.pool.get('res.users').browse(cr, uid, uid,
+                                          context).company_id.id,
+        'period_id': _get_default_period_id,
+        'date': lambda *a: time.strftime('%Y-%m-%d'),
+        'type': lambda *a: 'journal_voucher',  # Based on account move
+        'csv_delimiter': lambda *a: ';',
+        'csv_quotechar': lambda *a: '"',
+        'csv_decimal_separator': lambda *a: '.',
+        'csv_thousands_separator': lambda *a: ',',
+        'csv_code_index': lambda *a: 0,
+        'csv_ref_index': lambda *a: 1,
+        'csv_debit_index': lambda *a: 2,
+        'csv_credit_index': lambda *a: 3,
+        'csv_code_regexp': lambda *a: r'^[0-9]+$',
+        'csv_ref_regexp': lambda *a: r'^.*$',
+        'csv_debit_regexp': lambda *a: r'^[0-9\-\.\,]*$',
+        'csv_credit_regexp': lambda *a: r'^[0-9\-\.\,]*$',
+    }
+
+    def action_import(self, cr, uid, ids, context=None):
+        """
+        Imports a CSV file into a new account move using the options from
+        the wizard.
+        """
+        logger = logging.getLogger("account_move_importer")
+        for wiz in self.browse(cr, uid, ids, context):
+            if not wiz.input_file:
+                raise osv.except_osv(_('UserError'),
+                                     _("You need to select a file!"))
+
+            account_move_data = self.pool.get('account.move').default_get(cr,
+                                                                          uid, ['state', 'name'])
+            account_move_data.update({
+                'ref': wiz.ref,
+                'journal_id': wiz.journal_id.id,
+                'period_id': wiz.period_id.id,
+                'date': wiz.date,
+                'type': wiz.type,
+                'line_id': [],
+                'partner_id': False,
+                'to_check': 0
+            })
+
+            lines_data = account_move_data['line_id']
+
+            # Decode the file data
+            data = base64.b64decode(wiz.input_file)
+
+            #
+            # Read the file
+            #
+            reader = csv.reader(StringIO.StringIO(data),
+                                delimiter=str(wiz.csv_delimiter),
+                                quotechar=str(wiz.csv_quotechar))
+
+            for record in reader:
+                # Ignore short records
+                if len(record) > wiz.csv_code_index \
+                        and len(record) > wiz.csv_ref_index \
+                        and len(record) > wiz.csv_debit_index \
+                        and len(record) > wiz.csv_credit_index:
+
+                    record_code = record[wiz.csv_code_index]
+                    record_ref = record[wiz.csv_ref_index]
+                    record_debit = record[wiz.csv_debit_index]
+                    record_credit = record[wiz.csv_credit_index]
+
+                    #
+                    # Ignore invalid records
+                    #
+                    if re.match(wiz.csv_code_regexp, record_code) \
+                            and re.match(wiz.csv_ref_regexp, record_ref) \
+                            and re.match(wiz.csv_debit_regexp, record_debit) \
+                            and re.match(wiz.csv_credit_regexp, record_credit):
+                        #
+                        # Clean the input amounts
+                        #
+                        record_debit = float(record_debit.replace(wiz.csv_thousands_separator, '').replace(wiz.csv_decimal_separator, '.'))
+                        record_credit = float(record_credit.replace(wiz.csv_thousands_separator, '').replace(wiz.csv_decimal_separator, '.'))
+
+                        #
+                        # Find the account (or fail!)
+                        #
+                        account_ids = self.pool.get(
+                            'account.account').search(cr,
+                                                      uid, [
+                                                      ('code',
+                                                       '=', record_code),
+                                                      ('company_id',
+                                                       '=', wiz.company_id.id)
+                                                      ])
+                        if not account_ids:
+                            raise osv.except_osv(_('Error'),
+                                                 _("Account not found: %s!") % record_code)
+
+                        #
+                        # Prepare the line data
+                        #
+                        line_data = {
+                            'account_id': account_ids[0],
+                            'debit': 0.0,
+                            'credit': 0.0,
+                            'name': record_ref,
+                            'ref': False,
+                            'currency_id': False,
+                            'tax_amount': False,
+                            'partner_id': False,
+                            'tax_code_id': False,
+                            'date_maturity': False,
+                            'amount_currency': False,
+                            'analytic_account_id': False,
+                        }
+
+                        #
+                        # Create a debit line + a credit line if needed
+                        #
+                        line_data_debit = line_data.copy()
+                        line_data_credit = line_data
+                        if record_debit != 0.0:
+                            line_data_debit['debit'] = record_debit
+                            lines_data.append((0, 0, line_data_debit))
+                        if record_credit != 0.0:
+                            line_data_credit['credit'] = record_credit
+                            lines_data.append((0, 0, line_data_credit))
+                    else:
+                        logger.warning("Invalid record format\
+                                (ignoring line): %s" % repr(record))
+                else:
+                    logger.warning("Too short record\
+                                (ignoring line): %s" % repr(record))
+
+        # Finally create the move
+        move_id = self.pool.get('account.move').create(cr, uid,
+                                                       account_move_data)
+
+        #
+        # Show the move to the user
+        #
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [
+            ('model', '=', 'ir.ui.view'),
+            ('module', '=', 'account'),
+            ('name', '=', 'view_move_form')
+        ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid,
+                                                          model_data_ids, fields=['res_id'])[0]['res_id']
+
+        return {
+            'name': _("Imported account moves"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.move',
+            'view_type': 'form',
+            'view_mode': 'form,tree',
+            #'view_id': (resource_id, 'View'),
+            'views': [(False, 'tree'), (resource_id, 'form')],
+            'domain': "[('id', '=', %s)]" % move_id,
+        }
+
+account_move_importer_wizard()
 
=== added file 'account_admin_tools/account_move_importer_wizard.xml'
--- account_admin_tools/account_move_importer_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/account_move_importer_wizard.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="view_account_move_importer_wizard_form" model="ir.ui.view">
+            <field name="name">account_move_importer_wizard.form</field>
+            <field name="model">account_move_importer_wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Account move importer">
+                    <label string="This wizard will import one account move from a CSV file." colspan="4"/>
+                    <label string="Note: It will fail if any of the accounts do not exist in OpenERP." colspan="4"/>
+                    <label string=""/>
+                    <newline/>
+                    <group string="Account move parameters" colspan="4">
+                        <label string="Select the parameters for the account move"/>
+                        <group colspan="4">
+                            <field name="ref"/>
+                            <field name="company_id"/>
+                            <newline/>
+                            <field name="journal_id"/>
+                            <field name="type"/>
+                            <newline/>
+                            <field name="period_id"/>
+                            <field name="date"/>
+                        </group>
+                    </group>
+                    <group string="Input file" colspan="4">
+                        <label string="Select the CSV file with the lines for the account move"/>
+                        <group colspan="4">
+                            <field name="input_file_name" string="File"/>
+                            <field name="input_file" filename="input_file_name" nolabel="1"/>
+                            <group colspan="2">
+                                <separator string="File format" colspan="4"/>
+                                <field name="csv_delimiter"/>
+                                <field name="csv_quotechar"/>
+                                <field name="csv_thousands_separator"/>
+                                <field name="csv_decimal_separator"/>
+                            </group>
+                            <group colspan="2">
+                                <separator string="Record format" colspan="4"/>
+                                <field name="csv_code_index"/>
+                                <field name="csv_code_regexp"/>
+                                <field name="csv_ref_index"/>
+                                <field name="csv_ref_regexp"/>
+                                <field name="csv_debit_index"/>
+                                <field name="csv_debit_regexp"/>
+                                <field name="csv_credit_index"/>
+                                <field name="csv_credit_regexp"/>
+                            </group>
+                        </group>
+                    </group>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Import" name="action_import" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_account_move_importer_wizard" model="ir.actions.act_window">
+            <field name="name">Import Account Move from CSV</field>
+            <field name="res_model">account_move_importer_wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_account_move_importer_wizard"
+            parent="menu_action_account_admin_tools"
+            action="action_account_move_importer_wizard"
+            sequence="20"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/admin_tools_menu.xml'
--- account_admin_tools/admin_tools_menu.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/admin_tools_menu.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <menuitem id="menu_action_account_admin_tools"
+            name="Admin Tools"
+            parent="account.menu_finance"
+            sequence="999"/>
+
+        <menuitem id="menu_action_account_admin_tools_import"
+            name="Import"
+            parent="menu_action_account_admin_tools"
+            sequence="10"/>
+            
+        <menuitem id="menu_action_account_admin_tools_repair"
+            name="Check and Repair"
+            parent="menu_action_account_admin_tools"
+            sequence="20"/>
+    </data>
+</openerp>
 
=== added directory 'account_admin_tools/i18n'
=== added file 'account_admin_tools/move_partner_account.py'
--- account_admin_tools/move_partner_account.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/move_partner_account.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,188 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Move Partner Account Wizard
+
+Checks that the account moves use the partner account instead of a
+generic account.
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class move_partner_account(osv.osv_memory):
+    """
+    Move Partner Account Wizard
+
+    Checks that the account moves use the partner account instead of a
+    generic account.
+    """
+    _name = "account_admin_tools.move_partner_account"
+    _description = "Move Partner Account Wizard"
+
+    _columns = {
+        'state': fields.selection([('new', 'New'), ('done', 'Done')],
+                                  'Status', readonly=True),
+        #
+        # Account move parameters
+        #
+        'company_id': fields.many2one('res.company', 'Company',
+                                      required=True, readonly=True),
+        'period_ids': fields.many2many('account.period',
+                                       'move_partner_account_period_rel', 'wizard_id',
+                                       'period_id', "Periods"),
+        'account_payable_id': fields.many2one('account.account',
+                                              'Account Payable', required=True),
+        'account_receivable_id': fields.many2one('account.account',
+                                                 'Account Receivable', required=True),
+    }
+
+    def _get_payable_account_id(self, cr, uid, context=None):
+        """
+        Gets the default payable (supplier) account property value for the
+        current (user's) company.
+        """
+        if context is None:
+            context = {}
+        company_id = self.pool.get('res.users').browse(cr, uid, uid,
+                                                       context).company_id.id
+        res = None
+        property_ids = self.pool.get('ir.property').search(cr, uid, [
+            '|',
+            ('company_id', '=', company_id),
+            ('company_id', '=', False),
+            ('name', '=', 'property_account_payable'),
+            ('res_id', '=', False)
+        ])
+        if property_ids:
+            property = self.pool.get(
+                'ir.property').browse(cr, uid, property_ids[0])
+            if property:
+                try:
+                    # OpenERP 5.0 and 5.2/6.0 revno <= 2236
+                    res = int(property.value.split(',')[1])
+                except AttributeError:
+                    # OpenERP 6.0 revno >= 2236
+                    res = property.value_reference.id
+        return res
+
+    def _get_receivable_account_id(self, cr, uid, context=None):
+        """
+        Gets the default receivable (customer) account property value for the
+        current (user's) company.
+        """
+        company_id = self.pool.get('res.users').browse(cr, uid, uid,
+                                                       context).company_id.id
+        res = None
+        property_ids = self.pool.get('ir.property').search(cr, uid, [
+            '|',
+            ('company_id', '=', company_id),
+            ('company_id', '=', False),
+            ('name', '=', 'property_account_receivable'),
+            ('res_id', '=', False)
+        ])
+        if property_ids:
+            property = self.pool.get('ir.property').browse(cr, uid,
+                                                           property_ids[0])
+            if property:
+                try:
+                    # OpenERP 5.0 and 5.2/6.0 revno <= 2236
+                    res = int(property.value.split(',')[1])
+                except AttributeError:
+                    # OpenERP 6.0 revno >= 2236
+                    res = property.value_reference.id
+        return res
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context:
+        self.pool.get('res.users').browse(cr, uid, uid,
+                                          context).company_id.id,
+        'account_payable_id': _get_payable_account_id,
+        'account_receivable_id': _get_receivable_account_id,
+    }
+
+    def action_set_partner_accounts_in_moves(self, cr, uid, ids, context=None):
+        """
+        Action that searchs for the account moves that do not use the partner
+        account, but the generic payable/receivable one, and sets the partner
+        account instead.
+        """
+        for wiz in self.browse(cr, uid, ids, context):
+            period_ids = [period.id for period in wiz.period_ids]
+            query_acc = """
+                    UPDATE account_move_line
+                    SET account_id=%s
+                    WHERE partner_id=%s
+                          AND account_id=%s
+                    """
+            query_inv = """
+                    UPDATE account_invoice
+                    SET account_id=%s
+                    WHERE partner_id=%s
+                          AND account_id=%s
+                    """
+            periods_str = ','.join(map(str, period_ids))
+            if period_ids:
+                query_acc += """      AND period_id IN (%s)""" % periods_str
+                query_inv += """      AND period_id IN (%s)""" % periods_str
+
+            partner_ids = self.pool.get('res.partner').search(cr, uid, [])
+            for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
+                # Receivable account
+                if partner.property_account_receivable.id != wiz.account_receivable_id.id:
+                    cr.execute(query_acc % (partner.property_account_receivable.id, partner.id, wiz.account_receivable_id.id))
+                    cr.execute(query_inv % (partner.property_account_receivable.id, partner.id, wiz.account_receivable_id.id))
+                # Payable account
+                if partner.property_account_payable.id != wiz.account_payable_id.id:
+                    cr.execute(query_acc % (partner.property_account_payable.id, partner.id, wiz.account_payable_id.id))
+                    cr.execute(query_inv % (partner.property_account_payable.id, partner.id, wiz.account_payable_id.id))
+
+            # Update the wizard status
+            self.write(cr, uid, [wiz.id], {'state': 'done'})
+
+        #
+        # Return the next view: Show 'done' view
+        #
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [
+            ('model', '=', 'ir.ui.view'),
+            ('module', '=', 'account_admin_tools'),
+            ('name', '=', 'view_move_partner_account_done_form')
+        ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+
+        return {
+            'name': _("Set Partner Accounts in Moves"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account_admin_tools.move_partner_account',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'views': [(resource_id, 'form')],
+            'domain': "[('id', 'in', %s)]" % ids,
+            'context': context,
+            'target': 'new',
+        }
+
+
+move_partner_account()
 
=== added file 'account_admin_tools/move_partner_account.xml'
--- account_admin_tools/move_partner_account.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/move_partner_account.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_move_partner_account_form" model="ir.ui.view">
+            <field name="name">move_partner_account.form</field>
+            <field name="model">account_admin_tools.move_partner_account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set Partner Accounts in Moves">
+                    <label string="This wizard will set the receivable/payable account of the partners, in moves and invoices where a generic receivable/payable account was used instead." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <newline/>
+                    <group string="Parameters" colspan="4">
+                        <separator string="Accounts to replace with partner accounts" colspan="4"/>
+                        <field name="account_receivable_id"/>
+                        <field name="account_payable_id"/>
+                        <newline/>
+                        <separator string="Filter for the moves to update" colspan="4"/>
+                        <field name="period_ids" colspan="4"/>
+                    </group>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Set partner accounts" name="action_set_partner_accounts_in_moves" type="object" icon="gtk-apply"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_move_partner_account_done_form" model="ir.ui.view">
+            <field name="name">move_partner_account.done.form</field>
+            <field name="model">account_admin_tools.move_partner_account</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set Partner Accounts in Moves">
+                    <label string="The partner's receivable/payable accounts have been set succesfuly on the account moves!" colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Done" special="cancel" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_move_partner_account" model="ir.actions.act_window">
+            <field name="name">Set Partner Accounts in Moves</field>
+            <field name="res_model">account_admin_tools.move_partner_account</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_move_partner_account_form"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_move_partner_account"
+            parent="menu_action_account_admin_tools_repair"
+            action="action_move_partner_account"
+            sequence="110"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/move_partner_account_wizard.py'
--- account_admin_tools/move_partner_account_wizard.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/move_partner_account_wizard.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,145 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Move Partner Account Wizard
+
+Checks that the account moves use the partner account instead of a
+generic account.
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class move_partner_account_wizard(osv.osv_memory):
+    """
+    Move Partner Account Wizard
+
+    Checks that the account moves use the partner account instead of a
+    generic account.
+    """
+    _name = "move_partner_account_wizard"
+    _description = "Move Partner Account Wizard"
+
+    _columns = {
+        #
+        # Account move parameters
+        #
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True),
+
+        'period_ids': fields.many2many('account.period', 'move_partner_account_wizard_period_rel', 'wizard_id', 'period_id', "Periods"),
+
+        'account_payable_id': fields.many2one('account.account', 'Account Payable', required=True),
+        'account_receivable_id': fields.many2one('account.account', 'Account Receivable', required=True),
+    }
+
+    def _get_payable_account_id(self, cr, uid, context=None):
+        if context is None:
+            context = {}
+        company_id = self.pool.get(
+            'res.users').browse(cr, uid, uid, context).company_id.id
+        res = None
+        property_ids = self.pool.get('ir.property').search(cr, uid, [
+            '|',
+            ('company_id', '=', company_id),
+            ('company_id', '=', False),
+            ('name', '=', 'property_account_payable'),
+            ('res_id', '=', False)
+        ])
+        if property_ids:
+            property = self.pool.get(
+                'ir.property').browse(cr, uid, property_ids[0])
+            if property:
+                try:
+                    # OpenERP 5.0 and 5.2/6.0 revno <= 2236
+                    res = int(property.value.split(',')[1])
+                except AttributeError:
+                    # OpenERP 6.0 revno >= 2236
+                    res = property.value_reference.id
+        return res
+
+    def _get_receivable_account_id(self, cr, uid, context=None):
+        company_id = self.pool.get(
+            'res.users').browse(cr, uid, uid, context).company_id.id
+        res = None
+        property_ids = self.pool.get('ir.property').search(cr, uid, [
+            '|',
+            ('company_id', '=', company_id),
+            ('company_id', '=', False),
+            ('name', '=', 'property_account_receivable'),
+            ('res_id', '=', False)
+        ])
+        if property_ids:
+            property = self.pool.get(
+                'ir.property').browse(cr, uid, property_ids[0])
+            if property:
+                try:
+                    # OpenERP 5.0 and 5.2/6.0 revno <= 2236
+                    res = int(property.value.split(',')[1])
+                except AttributeError:
+                    # OpenERP 6.0 revno >= 2236
+                    res = property.value_reference.id
+        return res
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id,
+        'account_payable_id': _get_payable_account_id,
+        'account_receivable_id': _get_receivable_account_id,
+    }
+
+    def action_set_partner_accounts_in_moves(self, cr, uid, ids, context=None):
+        for wiz in self.browse(cr, uid, ids, context):
+            period_ids = [period.id for period in wiz.period_ids]
+            query_acc = """
+                    UPDATE account_move_line
+                    SET account_id=%s
+                    WHERE partner_id=%s
+                          AND account_id=%s
+                    """
+            query_inv = """
+                    UPDATE account_invoice
+                    SET account_id=%s
+                    WHERE partner_id=%s
+                          AND account_id=%s
+                    """
+            periods_str = ','.join(map(str, period_ids))
+            if period_ids:
+                query_acc += """      AND period_id IN (%s)""" % periods_str
+                query_inv += """      AND period_id IN (%s)""" % periods_str
+
+            partner_ids = self.pool.get('res.partner').search(cr, uid, [])
+            for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids):
+                # Receivable account
+                if partner.property_account_receivable.id != wiz.account_receivable_id.id:
+                    cr.execute(query_acc % (partner.property_account_receivable.id, partner.id, wiz.account_receivable_id.id))
+                    cr.execute(query_inv % (partner.property_account_receivable.id, partner.id, wiz.account_receivable_id.id))
+                # Payable account
+                if partner.property_account_payable.id != wiz.account_payable_id.id:
+                    cr.execute(query_acc % (partner.property_account_payable.id, partner.id, wiz.account_payable_id.id))
+                    cr.execute(query_inv % (partner.property_account_payable.id, partner.id, wiz.account_payable_id.id))
+
+        return {}
+
+
+move_partner_account_wizard()
 
=== added file 'account_admin_tools/move_partner_account_wizard.xml'
--- account_admin_tools/move_partner_account_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/move_partner_account_wizard.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_move_partner_account_wizard_form" model="ir.ui.view">
+            <field name="name">move_partner_account_wizard.form</field>
+            <field name="model">move_partner_account_wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set partner account in moves">
+                    <label string="This wizard will set the receivable/payable account of the partners, in moves and invoices where a generic receivable/payable account was used instead." colspan="4"/>
+                    <label string=""/>
+                    <newline/>
+                    <group string="Parameters" colspan="4">
+                        <separator string="Accounts to replace with partner accounts" colspan="4"/>
+                        <field name="account_receivable_id"/>
+                        <field name="account_payable_id"/>
+                        <newline/>
+                        <separator string="Filter for the moves to update" colspan="4"/>
+                        <field name="period_ids" colspan="4"/>
+                    </group>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Set partner accounts" name="action_set_partner_accounts_in_moves" type="object" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_move_partner_account_wizard" model="ir.actions.act_window">
+            <field name="name">Set Partner Account in Moves</field>
+            <field name="res_model">move_partner_account_wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_move_partner_account_wizard"
+            parent="menu_action_account_admin_tools"
+            action="action_move_partner_account_wizard"
+            sequence="20"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/revalidate_moves.py'
--- account_admin_tools/revalidate_moves.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/revalidate_moves.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Revalidate Account Moves Wizard
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class revalidate_moves(osv.osv_memory):
+    """
+    Revalidate Account Moves Wizard
+
+    Revalidates all the (already confirmed) moves, so their analytic lines
+    are recomputed (to fix the data after problems like this:
+    https://bugs.launchpad.net/openobject-addons/+bug/582988).
+    """
+    _name = "account_admin_tools.revalidate_moves"
+    _description = "Revalidate Account Moves Wizard"
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True),
+        'period_ids': fields.many2many('account.period', 'revalidate_moves_period_rel', 'wizard_id', 'period_id', "Periods"),
+        'move_ids': fields.many2many('account.move', 'revalidate_moves_moves_rel', 'wizard_id', 'move_id', 'Moves'),
+        'state': fields.selection([('new', 'New'), ('ready', 'Ready'), ('done', 'Done')], 'Status', readonly=True),
+    }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id,
+        'move_ids': lambda self, cr, uid, context: context and context.get('move_ids', None),
+        'period_ids': lambda self, cr, uid, context: context and context.get('period_ids', None),
+        'state': lambda self, cr, uid, context: context and context.get('state', 'new'),
+    }
+
+    def _next_view(self, cr, uid, ids, view_name, args=None, context=None):
+        """
+        Return the next view
+        """
+        if context is None:
+            context = {}
+        if args is None:
+            args = {}
+        ctx = context.copy()
+        ctx.update(args)
+
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [
+            ('model', '=', 'ir.ui.view'),
+            ('module', '=', 'account_admin_tools'),
+            ('name', '=', view_name)
+        ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+            'name': _("Revalidate Moves"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account_admin_tools.revalidate_moves',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'views': [(resource_id, 'form')],
+            'domain': "[('id', 'in', %s)]" % ids,
+            'context': ctx,
+            'target': 'new',
+        }
+
+    def action_skip_new(self, cr, uid, ids, context=None):
+        """
+        Action that just skips the to the ready state
+        """
+        return self._next_view(cr, uid, ids, 'view_revalidate_moves_ready_form', {'state': 'ready'}, context)
+
+    def action_find_moves_missing_analytic_lines(self, cr, uid, ids, context=None):
+        """
+        Finds account moves with missing analytic lines and adds them
+        to the move_ids many2many field.
+        """
+        wiz = self.browse(cr, uid, ids[0], context)
+
+        # FIXME: The next block of code is a workaround to the lp:586252 bug of the 6.0 client.
+        #        (https://bugs.launchpad.net/openobject-client/+bug/586252)
+        if wiz.period_ids:
+            period_ids = [period.id for period in wiz.period_ids]
+        else:
+            period_ids = context and context.get('period_ids')
+
+        query = """
+                SELECT account_move_line.move_id FROM account_move_line
+                LEFT JOIN account_analytic_line
+                ON account_analytic_line.move_id = account_move_line.id
+                WHERE account_move_line.analytic_account_id IS NOT NULL AND account_analytic_line.id IS NULL
+                """
+        if period_ids:
+            query += """      AND period_id IN %s"""
+            cr.execute(query, (tuple(period_ids),))
+        else:
+            cr.execute(query)
+
+        move_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
+
+        #
+        # Return the next view: Show 'ready' view
+        #
+        args = {
+            'move_ids': move_ids,
+            'state': 'ready',
+        }
+        return self._next_view(cr, uid, ids, 'view_revalidate_moves_ready_form', args, context)
+
+    def action_revalidate_moves(self, cr, uid, ids, context=None):
+        """
+        Calls the validate method of the account moves for each move in the
+        move_ids many2many.
+        """
+        wiz = self.browse(cr, uid, ids[0], context)
+
+        # FIXME: The next block of code is a workaround to the lp:586252 bug of the 6.0 client.
+        #        (https://bugs.launchpad.net/openobject-client/+bug/586252)
+        if wiz.move_ids:
+            move_ids = [line.id for line in wiz.move_ids]
+        else:
+            move_ids = context and context.get('move_ids')
+
+        for move in self.pool.get('account.move').browse(cr, uid, move_ids, context=context):
+            # We validate the moves one by one to prevent problems
+            self.pool.get('account.move').validate(cr, uid, [move.id], context)
+
+        #
+        # Return the next view: Show 'done' view
+        #
+        args = {
+            'move_ids': move_ids,
+            'state': 'done',
+        }
+        return self._next_view(cr, uid, ids, 'view_revalidate_moves_done_form', args, context)
+
+
+revalidate_moves()
 
=== added file 'account_admin_tools/revalidate_moves.xml'
--- account_admin_tools/revalidate_moves.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/revalidate_moves.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_revalidate_moves_form" model="ir.ui.view">
+            <field name="name">revalidate_moves.form</field>
+            <field name="model">account_admin_tools.revalidate_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Revalidate Account Moves">
+                    <label string="This wizard will revalidate the account moves, so their analytic lines are regenerated." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <separator string="Find moves with missing analytic lines" colspan="4"/>
+                        <label string="You may now search for account moves with missing analytic lines on the given periods, or you may skip this step and select the moves by hand." colspan="4"/>
+                        <label string="" colspan="4"/>
+                        <newline/>
+                        <field name="period_ids" colspan="4"/>
+                        <label string="" colspan="4"/>
+                        <newline/>
+                        <button string="Search for moves" name="action_find_moves_missing_analytic_lines" type="object" icon="gtk-ok" colspan="4"/>
+                    </group>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Skip" name="action_skip_new" type="object" icon="gtk-go-forward"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        
+        <record id="view_revalidate_moves_ready_form" model="ir.ui.view">
+            <field name="name">revalidate_moves.ready.form</field>
+            <field name="model">account_admin_tools.revalidate_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Revalidate Account Moves">
+                    <label string="The selected moves will be revalidated, that will regenerate their analytic lines." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <separator string="Account moves to revalidate" colspan="4"/>
+                    <field name="move_ids" colspan="4" nolabel="1"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Revalidate selected moves" name="action_revalidate_moves" type="object" icon="gtk-apply"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_revalidate_moves_done_form" model="ir.ui.view">
+            <field name="name">revalidate_moves.done.form</field>
+            <field name="model">account_admin_tools.revalidate_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Revalidate Account Moves">
+                    <label string="The moves have been revalidated sucessfully!" colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <separator string="Revalidated account moves" colspan="4"/>
+                    <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Done" special="cancel" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_revalidate_moves" model="ir.actions.act_window">
+            <field name="name">Revalidate Account Moves (Regenerate Analytic Lines)</field>
+            <field name="res_model">account_admin_tools.revalidate_moves</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_revalidate_moves_form"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_revalidate_moves"
+            parent="menu_action_account_admin_tools_repair"
+            action="action_revalidate_moves"
+            sequence="20"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/revalidate_moves_wizard.py'
--- account_admin_tools/revalidate_moves_wizard.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/revalidate_moves_wizard.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Revalidate Account Moves Wizard
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class revalidate_moves_wizard(osv.osv_memory):
+    """
+    Revalidate Account Moves Wizard
+
+    Revalidates all the (already confirmed) moves, so their analytic lines
+    are recomputed (to fix the data after problems like this:
+    https://bugs.launchpad.net/openobject-addons/+bug/582988).
+    """
+    _name = "revalidate_moves_wizard"
+    _description = "Revalidate Account Moves Wizard"
+
+    _columns = {
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True),
+        'period_ids': fields.many2many('account.period', 'revalidate_moves_wizard_period_rel', 'wizard_id', 'period_id', "Periods"),
+        'move_ids': fields.many2many('account.move', 'revalidate_moves_wizard_moves_rel', 'wizard_id', 'move_id', 'Moves'),
+        'state': fields.selection([('new', 'New'), ('ready', 'Ready'), ('done', 'Done')], 'Status', readonly=True),
+    }
+
+    _defaults = {
+        'state': lambda *a: 'new',
+    }
+
+    def action_skip_new(self, cr, uid, ids, context=None):
+        """
+        Skips to the ready state.
+        """
+        for wiz in self.browse(cr, uid, ids, context):
+            self.write(cr, uid, [wiz.id], {'state': 'ready'})
+        return True
+
+    def action_find_moves_missing_analytic_lines(self, cr, uid, ids, context=None):
+        """
+        Finds account moves with missing analytic lines and adds them
+        to the move_ids many2many field.
+        """
+        for wiz in self.browse(cr, uid, ids, context):
+            period_ids = [period.id for period in wiz.period_ids]
+            query = """
+                    SELECT account_move_line.move_id FROM account_move_line
+                    LEFT JOIN account_analytic_line
+                    ON account_analytic_line.move_id = account_move_line.id
+                    WHERE account_move_line.analytic_account_id IS NOT NULL AND account_analytic_line.id IS NULL
+                    """
+            periods_str = ','.join(map(str, period_ids))
+            if period_ids:
+                query += """      AND period_id IN (%s)""" % periods_str
+
+            cr.execute(query)
+            move_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
+            self.write(cr, uid, [wiz.id], {
+                'move_ids': [(6, 0, move_ids)],
+                'state': 'ready'
+            })
+        return True
+
+    def action_revalidate_moves(self, cr, uid, ids, context=None):
+        """
+        Calls the validate method of the account moves for each move in the
+        move_ids many2many.
+        """
+        for wiz in self.browse(cr, uid, ids, context):
+            for move in wiz.move_ids:
+                # We validate the moves one by one to prevent problems
+                self.pool.get(
+                    'account.move').validate(cr, uid, [move.id], context)
+            self.write(cr, uid, [wiz.id], {'state': 'done'})
+        return True
+
+revalidate_moves_wizard()
 
=== added file 'account_admin_tools/revalidate_moves_wizard.xml'
--- account_admin_tools/revalidate_moves_wizard.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/revalidate_moves_wizard.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_revalidate_moves_wizard_form" model="ir.ui.view">
+            <field name="name">revalidate_moves_wizard.form</field>
+            <field name="model">revalidate_moves_wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Revalidate account moves">
+                    <label string="This wizard will revalidate the given account moves, so their analytic lines are regenerated." colspan="4"/>
+                    <label string=""/>
+                    <newline/>
+                    <group string="Moves to revalidate" attrs="{'invisible': [('state','!=','ready')]}">
+                        <field name="move_ids" colspan="4" nolabel="1"/>
+                    </group>
+                    <group string="Find moves with missing analytic lines" colspan="4" attrs="{'invisible': [('state','!=','new')]}">
+                        <button string="Search for moves" name="action_find_moves_missing_analytic_lines" type="object" icon="gtk-ok" states="new" colspan="4"/>
+                        <separator string="Filter for the moves" colspan="4"/>
+                        <field name="period_ids" colspan="4"/>
+                    </group>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel" states="new,ready"/>
+                        <button string="Skip" name="action_skip_new" type="object" icon="gtk-go-forward" states="new"/>
+                        <button string="Revalidate selected moves" name="action_revalidate_moves" type="object" icon="gtk-apply" states="ready"/>
+                        <button string="Done" special="cancel" icon="gtk-ok" states="done"/>
+                    </group>
+                    <field name="state" invisible="1"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_revalidate_moves_wizard" model="ir.actions.act_window">
+            <field name="name">Revalidate Account Moves (Regenerate Analytic Lines)</field>
+            <field name="res_model">revalidate_moves_wizard</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_revalidate_moves_wizard"
+            parent="menu_action_account_admin_tools"
+            action="action_revalidate_moves_wizard"
+            sequence="50"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/set_invoice_ref_in_moves.py'
--- account_admin_tools/set_invoice_ref_in_moves.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/set_invoice_ref_in_moves.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,205 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Set Invoice Reference in Moves
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class set_invoice_ref_in_moves(osv.osv_memory):
+    """
+    Set Invoice Reference in Moves
+
+    Searchs for account moves associated with invoices that do not have the
+    right reference (the reference from a supplier invoice or the number from
+    a customer invoice) and lets the user fix them.
+    """
+    _name = "account_admin_tools.set_invoice_ref_in_moves"
+    _description = "Set Invoice Reference in Moves"
+
+    _columns = {
+        'state': fields.selection([('new', 'New'), ('ready', 'Ready'), ('done', 'Done')], 'Status', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True),
+        'period_ids': fields.many2many('account.period', 'set_invoice_ref_in_moves_period_rel', 'wizard_id', 'period_id', "Periods"),
+        'move_ids': fields.many2many('account.move', 'set_invoice_ref_in_move_move_rel', 'wizard_id', 'move_id', 'Moves'),
+    }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id,
+        'move_ids': lambda self, cr, uid, context: context and context.get('move_ids', None),
+        'period_ids': lambda self, cr, uid, context: context and context.get('period_ids', None),
+        'state': lambda self, cr, uid, context: context and context.get('state', 'new'),
+    }
+
+    def _next_view(self, cr, uid, ids, view_name, args=None, context=None):
+        """
+        Return the next wizard view
+        """
+        if context is None:
+            context = {}
+        if args is None:
+            args = {}
+        ctx = context.copy()
+        ctx.update(args)
+
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [
+            ('model', '=', 'ir.ui.view'),
+            ('module', '=', 'account_admin_tools'),
+            ('name', '=', view_name)
+        ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+            'name': _("Set Invoice Reference in Moves"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account_admin_tools.set_invoice_ref_in_moves',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'views': [(resource_id, 'form')],
+            'domain': "[('id', 'in', %s)]" % ids,
+            'context': ctx,
+            'target': 'new',
+        }
+
+    def _get_reference(self, cr, uid, invoice, context=None):
+        """
+        Get's the reference for an account move given the related invoice.
+        """
+        if invoice.type in ('in_invoice', 'in_refund'):
+            return invoice.reference
+        else:
+            return self.pool.get('account.invoice')._convert_ref(cr, uid, invoice.number)
+
+    def _is_valid_reference(self, cr, uid, reference, invoice, context=None):
+        """
+        Checks that the given reference matches the invoice reference or number.
+        """
+        if reference == invoice.reference:
+            return True
+        elif reference == self.pool.get('account.invoice')._convert_ref(cr, uid, invoice.number):
+            return True
+        else:
+            return False
+
+    def action_skip_new(self, cr, uid, ids, context=None):
+        """
+        Action that just skips the to the ready state
+        """
+        return self._next_view(cr, uid, ids, 'view_set_invoice_ref_in_moves_ready_form', {'state': 'ready'}, context)
+
+    def action_find_moves_with_wrong_invoice_ref(self, cr, uid, ids, context=None):
+        """
+        Action that searchs for account moves associated with invoices,
+        that do not have the right reference.
+        """
+        wiz = self.browse(cr, uid, ids[0], context)
+
+        # FIXME: The next block of code is a workaround to the lp:586252 bug of the 6.0 client.
+        #        (https://bugs.launchpad.net/openobject-client/+bug/586252)
+        if wiz.period_ids:
+            period_ids = [period.id for period in wiz.period_ids]
+        else:
+            period_ids = context and context.get('period_ids')
+
+        #
+        # Find the invoices (on the given periods)
+        #
+        args = []
+        if period_ids:
+            args = [('period_id', 'in', period_ids)]
+        invoice_ids = self.pool.get(
+            'account.invoice').search(cr, uid, args, context=context)
+
+        #
+        # Get the moves with references not matching the desired ones
+        #
+        move_ids = []
+        for invoice in self.pool.get('account.invoice').browse(cr, uid, invoice_ids, context=context):
+            if invoice.move_id:
+                if not self._is_valid_reference(cr, uid, invoice.move_id.ref, invoice, context=context):
+                    reference = self._get_reference(
+                        cr, uid, invoice, context=context)
+                    if reference and len(reference):
+                        move_ids.append(invoice.move_id.id)
+
+        #
+        # Return the next view: Show 'ready' view
+        #
+        args = {
+            'move_ids': move_ids,
+            'state': 'ready',
+        }
+        return self._next_view(cr, uid, ids, 'view_set_invoice_ref_in_moves_ready_form', args, context)
+
+    def action_set_invoice_ref_in_moves(self, cr, uid, ids, context=None):
+        """
+        Action that sets the invoice reference or number as the account move
+        reference for the selected moves.
+        """
+        wiz = self.browse(cr, uid, ids[0], context)
+
+        # FIXME: The next block of code is a workaround to the lp:586252 bug of the 6.0 client.
+        #        (https://bugs.launchpad.net/openobject-client/+bug/586252)
+        if wiz.move_ids:
+            move_ids = [line.id for line in wiz.move_ids]
+        else:
+            move_ids = context and context.get('move_ids')
+
+        #
+        # Find the invoices of the moves
+        #
+        args = [('move_id', 'in', move_ids)]
+        invoice_ids = self.pool.get(
+            'account.invoice').search(cr, uid, args, context=context)
+
+        #
+        # Update the moves with the reference of the invoice.
+        #
+        for invoice in self.pool.get('account.invoice').browse(cr, uid, invoice_ids, context=context):
+            if invoice.move_id:
+                reference = self._get_reference(
+                    cr, uid, invoice, context=context)
+                if invoice.move_id.ref != reference:
+                    self.pool.get('account.move').write(cr, uid, [invoice.move_id.id], {'ref': reference}, context=context)
+
+                    #
+                    # Update the move line references too
+                    # (if they where equal to the move reference)
+                    #
+                    for line in invoice.move_id.line_id:
+                        if line.ref == invoice.move_id.ref:
+                            self.pool.get('account.move.line').write(cr, uid, [line.id], {'ref': reference}, context=context)
+
+        #
+        # Return the next view: Show 'done' view
+        #
+        args = {
+            'move_ids': move_ids,
+            'state': 'done',
+        }
+        return self._next_view(cr, uid, ids, 'view_set_invoice_ref_in_moves_done_form', args, context)
+
+
+set_invoice_ref_in_moves()
 
=== added file 'account_admin_tools/set_invoice_ref_in_moves.xml'
--- account_admin_tools/set_invoice_ref_in_moves.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/set_invoice_ref_in_moves.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_set_invoice_ref_in_moves_form" model="ir.ui.view">
+            <field name="name">set_invoice_ref_in_moves.form</field>
+            <field name="model">account_admin_tools.set_invoice_ref_in_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set Invoice Reference in Moves">
+                    <label string="This wizard will set the reference in account moves associated with invoices, that don't match the invoice reference/number." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <separator string="Find moves not matching the invoice reference/number" colspan="4"/>
+                        <label string="You may now search for account moves, on the given periods, whose reference does not match the invoice reference or number; or you may skip this step and select the moves by hand." colspan="4"/>
+                        <label string="" colspan="4"/>
+                        <newline/>
+                        <field name="period_ids" colspan="4"/>
+                        <label string="" colspan="4"/>
+                        <newline/>
+                        <button string="Search for moves" name="action_find_moves_with_wrong_invoice_ref" type="object" icon="gtk-ok" colspan="4"/>
+                    </group>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Skip" name="action_skip_new" type="object" icon="gtk-go-forward"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_set_invoice_ref_in_moves_ready_form" model="ir.ui.view">
+            <field name="name">set_invoice_ref_in_moves.ready.form</field>
+            <field name="model">account_admin_tools.set_invoice_ref_in_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set Invoice Reference in Moves">
+                    <label string="The reference will be set, for the selected account moves, to the reference/number of the (supplier/customer) invoice." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <separator string="Account moves to update" colspan="4"/>
+                    <field name="move_ids" colspan="4" nolabel="1"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Set invoice reference in moves" name="action_set_invoice_ref_in_moves" type="object" icon="gtk-apply"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_set_invoice_ref_in_moves_done_form" model="ir.ui.view">
+            <field name="name">set_invoice_ref_in_moves.done.form</field>
+            <field name="model">account_admin_tools.set_invoice_ref_in_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set Invoice Reference in Moves">
+                    <label string="The invoice references have been succesfully set on the account moves!" colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <separator string="Updated account moves" colspan="4"/>
+                    <field name="move_ids" colspan="4" nolabel="1" readonly="1"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Done" special="cancel" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_set_invoice_ref_in_moves" model="ir.actions.act_window">
+            <field name="name">Set Invoice Reference in Moves</field>
+            <field name="res_model">account_admin_tools.set_invoice_ref_in_moves</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_set_invoice_ref_in_moves_form"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_set_invoice_ref_in_moves"
+            parent="menu_action_account_admin_tools_repair"
+            action="action_set_invoice_ref_in_moves"
+            sequence="130"/>
+
+    </data>
+</openerp>
 
=== added file 'account_admin_tools/set_partner_in_moves.py'
--- account_admin_tools/set_partner_in_moves.py	1970-01-01 00:00:00 +0000
+++ account_admin_tools/set_partner_in_moves.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,214 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Pexego Sistemas Informáticos. All Rights Reserved
+#    $Id$
+#
+#    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/>.
+#
+##############################################################################
+"""
+Set Partner in Moves Wizard
+"""
+__author__ = "Borja López Soilán (Pexego)"
+
+import re
+from osv import fields, osv
+from tools.translate import _
+
+
+class set_partner_in_moves(osv.osv_memory):
+    """
+    Set Partner in Moves Wizard
+
+    Searchs for account move lines of that use the payable/receivable account
+    of a single partner, and have no partner reference in the line,
+    and sets the partner reference (partner_id).
+    This may fix cases where the receivable/payable amounts displayed in the
+    partner form does not match the balance of the receivable/payable accounts.
+    """
+    _name = "account_admin_tools.set_partner_in_moves"
+    _description = "Set Partner in Moves Wizard"
+
+    _columns = {
+        'state': fields.selection([('new', 'New'), ('ready', 'Ready'), ('done', 'Done')], 'Status', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True),
+        'period_ids': fields.many2many('account.period', 'set_partner_in_moves_period_rel', 'wizard_id', 'period_id', "Periods"),
+        'move_line_ids': fields.many2many('account.move.line', 'set_partner_in_move_move_line_rel', 'wizard_id', 'line_id', 'Move Lines'),
+    }
+
+    _defaults = {
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context).company_id.id,
+        'move_line_ids': lambda self, cr, uid, context: context and context.get('move_line_ids', None),
+        'period_ids': lambda self, cr, uid, context: context and context.get('period_ids', None),
+        'state': lambda self, cr, uid, context: context and context.get('state', 'new'),
+    }
+
+    def _next_view(self, cr, uid, ids, view_name, args=None, context=None):
+        """
+        Return the next wizard view
+        """
+        if context is None:
+            context = {}
+        if args is None:
+            args = {}
+        ctx = context.copy()
+        ctx.update(args)
+
+        model_data_ids = self.pool.get('ir.model.data').search(cr, uid, [
+            ('model', '=', 'ir.ui.view'),
+            ('module', '=', 'account_admin_tools'),
+            ('name', '=', view_name)
+        ])
+        resource_id = self.pool.get('ir.model.data').read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
+        return {
+            'name': _("Set Partner Reference in Moves"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account_admin_tools.set_partner_in_moves',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'views': [(resource_id, 'form')],
+            'domain': "[('id', 'in', %s)]" % ids,
+            'context': ctx,
+            'target': 'new',
+        }
+
+    def _get_accounts_map(self, cr, uid, context=None):
+        """
+        Find the receivable/payable accounts that are associated with
+        a single partner and return a (account.id, partner.id) map
+        """
+        partner_ids = self.pool.get(
+            'res.partner').search(cr, uid, [], context=context)
+        accounts_map = {}
+        for partner in self.pool.get('res.partner').browse(cr, uid, partner_ids, context=context):
+            #
+            # Add the receivable account to the map
+            #
+            if accounts_map.get(partner.property_account_receivable.id, None) is None:
+                accounts_map[
+                    partner.property_account_receivable.id] = partner.id
+            else:
+                # Two partners with the same receivable account: ignore
+                # this account!
+                accounts_map[partner.property_account_receivable.id] = 0
+            #
+            # Add the payable account to the map
+            #
+            if accounts_map.get(partner.property_account_payable.id, None) is None:
+                accounts_map[partner.property_account_payable.id] = partner.id
+            else:
+                # Two partners with the same receivable account: ignore
+                # this account!
+                accounts_map[partner.property_account_payable.id] = 0
+        return accounts_map
+
+    def action_skip_new(self, cr, uid, ids, context=None):
+        """
+        Action that just skips the to the ready state
+        """
+        return self._next_view(cr, uid, ids, 'view_set_partner_in_moves_ready_form', {'state': 'ready'}, context)
+
+    def action_find_moves_missing_partner(self, cr, uid, ids, context=None):
+        """
+        Action that searchs for account move lines of payable/receivable
+        accounts (of just one partner) that don't have the partner reference.
+        """
+        wiz = self.browse(cr, uid, ids[0], context)
+
+        # FIXME: The next block of code is a workaround to the lp:586252 bug of the 6.0 client.
+        #        (https://bugs.launchpad.net/openobject-client/+bug/586252)
+        if wiz.period_ids:
+            period_ids = [period.id for period in wiz.period_ids]
+        else:
+            period_ids = context and context.get('period_ids')
+
+        move_line_ids = []
+        accounts_map = self._get_accounts_map(cr, uid, context=context)
+
+        #
+        # Find the account move lines, of each of the accounts in the map
+        # that don't have a partner set.
+        #
+        query = """
+                SELECT id FROM account_move_line
+                WHERE account_id=%s
+                      AND partner_id IS NULL
+                """
+        if period_ids:
+            query += """      AND period_id IN %s"""
+
+        for account_id in accounts_map.keys():
+            if accounts_map[account_id] != 0:
+                if period_ids:
+                    cr.execute(query, (account_id, tuple(period_ids)))
+                else:
+                    cr.execute(query, (account_id,))
+                new_move_line_ids = filter(
+                    None, map(lambda x: x[0], cr.fetchall()))
+                if new_move_line_ids:
+                    move_line_ids.extend(new_move_line_ids)
+
+        #
+        # Return the next view: Show 'ready' view
+        #
+        args = {
+            'move_line_ids': move_line_ids,
+            'state': 'ready',
+        }
+        return self._next_view(cr, uid, ids, 'view_set_partner_in_moves_ready_form', args, context)
+
+    def action_set_partner_in_moves(self, cr, uid, ids, context=None):
+        """
+        Action that sets for each partner payable/receivable account,
+        that is used only on one partner, the parner reference on its move
+        lines.
+        """
+        wiz = self.browse(cr, uid, ids[0], context)
+
+        # FIXME: The next block of code is a workaround to the lp:586252 bug of the 6.0 client.
+        #        (https://bugs.launchpad.net/openobject-client/+bug/586252)
+        if wiz.move_line_ids:
+            move_line_ids = [line.id for line in wiz.move_line_ids]
+        else:
+            move_line_ids = context and context.get('move_line_ids')
+
+        accounts_map = self._get_accounts_map(cr, uid, context=context)
+
+        #
+        # Update the account move lines, of each of the accounts in the map
+        # that don't have a partner set, with the associated partner.
+        #
+        query = """
+                UPDATE account_move_line
+                SET partner_id=%s
+                WHERE id=%s
+                      AND partner_id IS NULL
+                """
+        for line in self.pool.get('account.move.line').browse(cr, uid, move_line_ids, context=context):
+            if accounts_map[line.account_id.id] != 0:
+                cr.execute(query, (accounts_map[line.account_id.id], line.id))
+
+        #
+        # Return the next view: Show 'done' view
+        #
+        args = {
+            'move_line_ids': move_line_ids,
+            'state': 'done',
+        }
+        return self._next_view(cr, uid, ids, 'view_set_partner_in_moves_done_form', args, context)
+
+
+set_partner_in_moves()
 
=== added file 'account_admin_tools/set_partner_in_moves.xml'
--- account_admin_tools/set_partner_in_moves.xml	1970-01-01 00:00:00 +0000
+++ account_admin_tools/set_partner_in_moves.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="view_set_partner_in_moves_form" model="ir.ui.view">
+            <field name="name">set_partner_in_moves.form</field>
+            <field name="model">account_admin_tools.set_partner_in_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set Partner Reference in Moves">
+                    <label string="This wizard will set the partner reference in moves where the receivable/payable account (of a single partner) is used." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <separator string="Find moves with missing partner reference" colspan="4"/>
+                        <label string="You may now search for move lines with missing partner reference on the given periods, or you may skip this step and select the move lines by hand." colspan="4"/>
+                        <label string="" colspan="4"/>
+                        <newline/>
+                        <field name="period_ids" colspan="4"/>
+                        <label string="" colspan="4"/>
+                        <newline/>
+                        <button string="Search for moves" name="action_find_moves_missing_partner" type="object" icon="gtk-ok" colspan="4"/>
+                    </group>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Skip" name="action_skip_new" type="object" icon="gtk-go-forward"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_set_partner_in_moves_ready_form" model="ir.ui.view">
+            <field name="name">set_partner_in_moves.ready.form</field>
+            <field name="model">account_admin_tools.set_partner_in_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set Partner Reference in Moves">
+                    <label string="The partner reference will be set, for the selected account move lines, to the one associated with the receivable/payable account." colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <separator string="Account move lines to update" colspan="4"/>
+                    <field name="move_line_ids" colspan="4" nolabel="1" domain="[('partner_id','=',False), ('account_id.type', 'in', ['receivable', 'payable'])]"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Cancel" special="cancel" icon="gtk-cancel"/>
+                        <button string="Set partner in moves" name="action_set_partner_in_moves" type="object" icon="gtk-apply"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_set_partner_in_moves_done_form" model="ir.ui.view">
+            <field name="name">set_partner_in_moves.done.form</field>
+            <field name="model">account_admin_tools.set_partner_in_moves</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Set Partner Reference in Moves">
+                    <label string="The partner references have been succesfully set on the account moves!" colspan="4"/>
+                    <label string="" colspan="4"/>
+                    <separator string="Updated account move lines" colspan="4"/>
+                    <field name="move_line_ids" colspan="4" nolabel="1" domain="[('partner_id','=',False), ('account_id.type', 'in', ['receivable', 'payable'])]" readonly="1"/>
+                    <label string="" colspan="4"/>
+                    <group colspan="4">
+                        <button string="Done" special="cancel" icon="gtk-ok"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_set_partner_in_moves" model="ir.actions.act_window">
+            <field name="name">Set Partner Reference in Moves</field>
+            <field name="res_model">account_admin_tools.set_partner_in_moves</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_set_partner_in_moves_form"/>
+            <field name="target">new</field>
+        </record>
+        <menuitem id="menu_action_set_partner_in_moves"
+            parent="menu_action_account_admin_tools_repair"
+            action="action_set_partner_in_moves"
+            sequence="120"/>
+
+    </data>
+</openerp>
 
=== added directory 'account_chart_update'
=== added file 'account_chart_update/__init__.py'
--- account_chart_update/__init__.py	1970-01-01 00:00:00 +0000
+++ account_chart_update/__init__.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (c) 2010 Zikzakmedia S.L. (http://www.zikzakmedia.com)
+#    Copyright (c) 2010 Pexego Sistemas Informáticos S.L. (http://www.pexego.es)
+#    @authors: Jordi Esteve (Zikzakmedia), Borja López Soilán (Pexego)
+#
+#    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/>.
+#
+##############################################################################
+"""
+Account Chart Update Wizard
+"""
+__authors__ = ["Jordi Esteve <[e-mail]>",
+               "Borja López Soilán <[e-mail]>"]
+
+import account
 
=== added file 'account_chart_update/__openerp__.py'
--- account_chart_update/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_chart_update/__openerp__.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (c) 2010 Zikzakmedia S.L. (http://www.zikzakmedia.com)
+#    Copyright (c) 2010 Pexego Sistemas Informáticos S.L. (http://www.pexego.es)
+#    @authors: Jordi Esteve (Zikzakmedia), Borja López Soilán (Pexego)
+#
+#    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": "Detect changes and update the Account Chart from a template",
+    "version": "6.1",
+    "author": "Zikzakmedia SL",
+    "website": "www.zikzakmedia.com",
+    "license": "GPL-3",
+    "depends": ["account"],
+    "category": "Generic Modules/Accounting",
+    "description": """
+Adds a wizard to update a company account chart from a chart template.
+
+This is a pretty useful tool to update OpenERP instalations after tax reforms
+on the oficial charts of accounts, or to apply fixes performed on the chart
+template.
+
+The wizard:
+
+- Allows the user to compare a chart and a template showing differences
+    on accounts, taxes, tax codes and fiscal positions.
+- It may create the new account, taxes, tax codes and fiscal positions detected
+    on the template.
+- It can also update (overwrite) the accounts, taxes, tax codes and fiscal
+    positions that got modified on the template.
+
+The wizard lets the user select what kind of objects must be checked/updated,
+and whether old records must be checked for changes and updated.
+It will display all the accounts to be created / updated with some information
+about the detected differences, and allow the user to exclude records
+individually.
+Any problem found while updating will be shown on the last step.
+
+Authors:
+    Jordi Esteve (Zikzakmedia) <[e-mail]>
+    Borja López Soilán (Pexego) <[e-mail]>
+""",
+    "init_xml": [],
+    "demo_xml": [],
+    "update_xml": [
+                "account_view.xml",
+    ],
+    "active": False,
+    "installable": True
+}
 
=== added file 'account_chart_update/account.py'
--- account_chart_update/account.py	1970-01-01 00:00:00 +0000
+++ account_chart_update/account.py	2012-12-07 10:00:37 +0000
@@ -0,0 +1,1329 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Copyright (c) 2010 Zikzakmedia S.L. (http://www.zikzakmedia.com)
+#    Copyright (c) 2010 Pexego Sistemas Informáticos S.L. (http://www.pexego.es)
+#    @authors: Jordi Esteve (Zikzakmedia), Borja López Soilán (Pexego)
+#
+#    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/>.
+#
+##############################################################################
+"""
+Account Chart Update Wizard
+"""
+__authors__ = ["Jordi Esteve <[e-mail]>",
+               "Borja López Soilán <[e-mail]>"]
+
+from osv import fields, osv
+from tools.translate import _
+import logging
+
+
+class WizardLog:
+    """
+    Small helper class to store the messages and errors on the wizard.
+    """
+    def __init__(self):
+        self.messages = []
+        self.errors = []
+
+    def add(self, message, is_error=False):
+        """
+        Adds a message to the log.
+        """
+        logger = logging.getLogger("account_chart_update")
+        if is_error:
+            logger.warning(u"Log line: %s" % message)
+            self.errors.append(message)
+        else:
+            logger.debug(u"Log line: %s" % message)
+        self.messages.append(message)
+
+    def has_errors(self):
+        """
+        Returns whether errors where logged.
+        """
+        return self.errors
+
+    def __call__(self):
+        return "".join(self.messages)
+
+    def __str__(self):
+        return "".join(self.messages)
+
+    def get_errors_str(self):
+        return "".join(self.errors)
+
+
+class wizard_update_charts_accounts(osv.osv_memory):
+    """
+    Updates an existing account chart for a company.
+    Wizards ask for:
+        * a company
+        * an account chart template
+        * a number of digits for formatting code of non-view accounts
+    Then, the wizard:
+        * generates/updates all accounts from the template and assigns them to the right company
+        * generates/updates all taxes and tax codes, changing account assignations
+        * generates/updates all accounting properties and assigns them correctly
+    """
+    _name = 'wizard.update.charts.accounts'
+
+    def _get_lang_selection_options(self, cr, uid, context={}):
+        """
+        Gets the available languages for the selection.
+        """
+        obj = self.pool.get('res.lang')
+        ids = obj.search(cr, uid, [], context=context)
+        res = obj.read(cr, uid, ids, ['code', 'name'], context)
+        return [(r['code'], r['name']) for r in res] + [('', '')]
+
+    _columns = {
+        'state': fields.selection([
+        ('init', 'Step 1'),
+        ('ready', 'Step 2'),
+        ('done', 'Wizard Complete')
+        ], 'Status', readonly=True),
+        'company_id': fields.many2one('res.company', 'Company', required=True),
+        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', required=True),
+        'code_digits': fields.integer('# of Digits', required=True, help="No. of Digits to use for account code. Make sure it is the same number as existing accounts."),
+        'lang': fields.selection(_get_lang_selection_options, 'Language', size=5, help="For records searched by name (taxes, tax codes, fiscal positions), the template name will be matched against the record name on this language."),
+        'update_tax_code': fields.boolean('Update tax codes', help="Existing tax codes are updated. Tax codes are searched by name."),
+        'update_tax': fields.boolean('Update taxes', help="Existing taxes are updated. Taxes are searched by name."),
+        'update_account': fields.boolean('Update accounts', help="Existing accounts are updated. Accounts are searched by code."),
+        'update_fiscal_position': fields.boolean('Update fiscal positions', help="Existing fiscal positions are updated. Fiscal positions are searched by name."),
+        'update_children_accounts_parent': fields.boolean("Update children accounts parent",
+                                                          help="Update the parent of accounts that seem (based on the code) to be children of the newly created ones. If you had an account 430 with a child 4300000, and a 4300 account is created, the 4300000 parent will be set to 4300."),
+        'continue_on_errors': fields.boolean("Continue on errors", help="If set, the wizard will continue to the next step even if there are minor errors (for example the parent account of a new account couldn't be set)."),
+        'tax_code_ids': fields.one2many('wizard.update.charts.accounts.tax.code', 'update_chart_wizard_id', 'Tax codes'),
+        'tax_ids': fields.one2many('wizard.update.charts.accounts.tax', 'update_chart_wizard_id', 'Taxes'),
+        'account_ids': fields.one2many('wizard.update.charts.accounts.account', 'update_chart_wizard_id', 'Accounts'),
+        'fiscal_position_ids': fields.one2many('wizard.update.charts.accounts.fiscal.position', 'update_chart_wizard_id', 'Fiscal positions'),
+        'new_tax_codes': fields.integer('New tax codes', readonly=True),
+        'new_taxes': fields.integer('New taxes', readonly=True),
+        'new_accounts': fields.integer('New accounts', readonly=True),
+        'new_fps': fields.integer('New fiscal positions', readonly=True),
+        'updated_tax_codes': fields.integer('Updated tax codes', readonly=True),
+        'updated_taxes': fields.integer('Updated taxes', readonly=True),
+        'updated_accounts': fields.integer('Updated accounts', readonly=True),
+        'updated_fps': fields.integer('Updated fiscal positions', readonly=True),
+        'log': fields.text('Messages and Errors', readonly=True)
+    }
+
+    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
+        """
+        Redefine the search to search by company name.
+        """
+        if not name:
+            name = '%'
+        if not args:
+            args = []
+        if not context:
+            context = {}
+        args = args[:]
+        ids = []
+        ids = self.search(
+            cr, user, [('company_id', operator, name)] + args, limit=limit)
+        return self.name_get(cr, user, ids, context=context)
+
+    def name_get(self, cr, uid, ids, context=None):
+        """
+        Use the company name and template as name.
+        """
+        if context is None:
+            context = {}
+        if not len(ids):
+            return []
+        records = self.browse(cr, uid, ids, context)
+        res = []
+        for record in records:
+            res.append((record.id, record.company_id.name +
+                       ' - ' + record.chart_template_id.name))
+        return res
+
+    def _get_chart(self, cr, uid, context=None):
+        """
+        Returns the default chart template.
+        """
+        if context is None:
+            context = {}
+        ids = self.pool.get(
+            'account.chart.template').search(cr, uid, [], context=context)
+        if ids:
+            return ids[0]
+        return False
+
+    def _get_code_digits(self, cr, uid, context=None, company_id=None):
+        """
+        Returns the default code size for the accounts.
+
+        To figure out the number of digits of the accounts it look at the
+        code size of the default receivable account of the company
+        (or user's company if any company is given).
+        """
+        if context is None:
+            context = {}
+        property_obj = self.pool.get('ir.property')
+        account_obj = self.pool.get('account.account')
+        if not company_id:
+            user = self.pool.get('res.users').browse(cr, uid, uid, context)
+            company_id = user.company_id.id
+        property_ids = property_obj.search(cr, uid, [('name', '=', 'property_account_receivable'), ('company_id', '=', company_id), ('res_id', '=', False), ('value_reference', '!=', False)])
+        if not property_ids:
+            # Try to get a generic (no-company) property
+            property_ids = property_obj.search(cr, uid, [('name', '=', 'property_account_receivable'), ('res_id', '=', False), ('value_reference', '!=', False)])
+        number_digits = 6
+        if property_ids:
+            prop = property_obj.browse(
+                cr, uid, property_ids[0], context=context)
+            account_id = prop.value_reference.id
+
+            if account_id:
+                code = account_obj.read(
+                    cr, uid, account_id, ['code'], context)['code']
+                number_digits = len(code)
+        return number_digits
+
+    _defaults = {
+        'state': lambda *a: 'init',
+        'company_id': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, [uid], context)[0].company_id.id,
+        'chart_template_id': _get_chart,
+        'update_tax_code': lambda *a: True,
+        'update_tax': lambda *a: True,
+        'update_account': lambda *a: True,
+        'update_fiscal_position': lambda *a: True,
+        'update_children_accounts_parent': lambda *a: True,
+        'continue_on_errors': lambda *a: False,
+        'lang': lambda self, cr, uid, context: context and context.get('lang') or None,
+    }
+
+    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        """
+        Update the code size when the company changes
+        """
+        res = {
+            'value': {
+                'code_digits': self._get_code_digits(cr, uid, context=context, company_id=company_id),
+            }
+        }
+        return res
+
+    def action_init(self, cr, uid, ids, context=None):
+        """
+        Initial action that sets the initial state.
+        """
+        if context is None:
+            context = {}
+        self.write(cr, uid, ids, {'state': 'init'}, context)
+        return True
+
+    ############################################################################
+    # Helper methods
+    ##########################################################################
+    def _map_tax_template(self, cr, uid, wizard, tax_template_mapping, tax_template, context=None):
+        """
+        Adds a tax template -> tax id to the mapping.
+        """
+        if tax_template and not tax_template_mapping.get(tax_template.id):
+            tax_facade = self.pool.get('account.tax')
+            tax_ids = tax_facade.search(cr, uid, [
+                ('name', '=', tax_template.name),
+                ('company_id', '=', wizard.company_id.id)
+            ], context=context)
+            if tax_ids:
+                tax_template_mapping[tax_template.id] = tax_ids[0]
+
+    def _map_tax_code_template(self, cr, uid, wizard, tax_code_template_mapping, tax_code_template, context=None):
+        """
+        Adds a tax code template -> tax code id to the mapping.
+        """
+        if tax_code_template and not tax_code_template_mapping.get(tax_code_template.id):
+            tax_code_facade = self.pool.get('account.tax.code')
+            root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
+            tax_code_name = (tax_code_template.id == root_tax_code_id) and wizard.company_id.name or tax_code_template.name
+            tax_code_ids = tax_code_facade.search(cr, uid, [
+                ('name', '=', tax_code_name),
+                ('company_id', '=', wizard.company_id.id)
+            ])
+            if tax_code_ids:
+                tax_code_template_mapping[
+                    tax_code_template.id] = tax_code_ids[0]
+
+    def _map_account_template(self, cr, uid, wizard, account_template_mapping, account_template, context=None):
+        """
+        Adds an account template -> account id to the mapping
+        """
+        if account_template and not account_template_mapping.get(account_template.id):
+            account_facade = self.pool.get('account.account')
+            code = account_template.code or ''
+            if account_template.type != 'view':
+                if len(code) > 0 and len(code) <= wizard.code_digits:
+                    code = '%s%s' % (
+                        code, '0' * (wizard.code_digits - len(code)))
+            account_ids = account_facade.search(cr, uid, [
+                ('code', '=', code),
+                ('company_id', '=', wizard.company_id.id)
+            ], context=context)
+            if account_ids:
+                account_template_mapping[account_template.id] = account_ids[0]
+
+    def _map_fp_template(self, cr, uid, wizard, fp_template_mapping, fp_template, context=None):
+        """
+        Adds a fiscal position template -> fiscal position id to the mapping.
+        """
+        if fp_template and not fp_template_mapping.get(fp_template.id):
+            fp_facade = self.pool.get('account.fiscal.position')
+            fp_ids = fp_facade.search(cr, uid, [
+                ('name', '=', fp_template.name),
+                ('company_id', '=', wizard.company_id.id)
+            ], context=context)
+            if fp_ids:
+                fp_template_mapping[fp_template.id] = fp_ids[0]
+
+    ############################################################################
+    # Find records methods
+    ##########################################################################
+    def _find_tax_codes(self, cr, uid, wizard, context=None):
+        """
+        Search for, and load, tax code templates to create/update.
+        """
+        new_tax_codes = 0
+        updated_tax_codes = 0
+        tax_code_template_mapping = {}
+
+        tax_code_templ_facade = self.pool.get('account.tax.code.template')
+        tax_code_facade = self.pool.get('account.tax.code')
+        wiz_tax_code_facade = self.pool.get(
+            'wizard.update.charts.accounts.tax.code')
+
+        # Remove previous tax codes
+        wiz_tax_code_facade.unlink(
+            cr, uid, wiz_tax_code_facade.search(cr, uid, []))
+
+        #
+        # Search for new / updated tax codes
+        #
+        root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
+        children_tax_code_template = tax_code_templ_facade.search(cr, uid, [(
+            'parent_id', 'child_of', [root_tax_code_id])], order='id')
+        for tax_code_template in tax_code_templ_facade.browse(cr, uid, children_tax_code_template):
+            # Ensure the tax code template is on the map (search for the mapped
+            # tax code id).
+            self._map_tax_code_template(cr, uid, wizard, tax_code_template_mapping, tax_code_template, context)
+
+            tax_code_id = tax_code_template_mapping.get(tax_code_template.id)
+            if not tax_code_id:
+                new_tax_codes += 1
+                wiz_tax_code_facade.create(cr, uid, {
+                    'tax_code_id': tax_code_template.id,
+                    'update_chart_wizard_id': wizard.id,
+                    'type': 'new',
+                }, context)
+            elif wizard.update_tax_code:
+                #
+                # Check the tax code for changes.
+                #
+                modified = False
+                notes = ""
+                tax_code = tax_code_facade.browse(
+                    cr, uid, tax_code_id, context=context)
+
+                if tax_code.code != tax_code_template.code:
+                    notes += _("The code field is different.\n")
+                    modified = True
+                if tax_code.info != tax_code_template.info:
+                    notes += _("The info field is different.\n")
+                    modified = True
+                if tax_code.sign != tax_code_template.sign:
+                    notes += _("The sign field is different.\n")
+                    modified = True
+
+                # TODO: We could check other account fields for changes...
+
+                if modified:
+                    #
+                    # Tax code to update.
+                    #
+                    updated_tax_codes += 1
+                    wiz_tax_code_facade.create(cr, uid, {
+                        'tax_code_id': tax_code_template.id,
+                        'update_chart_wizard_id': wizard.id,
+                        'type': 'updated',
+                        'update_tax_code_id': tax_code_id,
+                        'notes': notes,
+                    }, context)
+
+        return {'new': new_tax_codes, 'updated': updated_tax_codes, 'mapping': tax_code_template_mapping}
+
+    def _find_taxes(self, cr, uid, wizard, context=None):
+        """
+        Search for, and load, tax templates to create/update.
+        """
+        new_taxes = 0
+        updated_taxes = 0
+        tax_template_mapping = {}
+
+        tax_facade = self.pool.get('account.tax')
+        wiz_tax_facade = self.pool.get('wizard.update.charts.accounts.tax')
+
+        delay_wiz_tax = []
+        # Remove previous taxes
+        wiz_tax_facade.unlink(cr, uid, wiz_tax_facade.search(cr, uid, []))
+
+        #
+        # Search for new / updated taxes
+        #
+        for tax_template in wizard.chart_template_id.tax_template_ids:
+            # Ensure the tax template is on the map (search for the mapped tax
+            # id).
+            self._map_tax_template(
+                cr, uid, wizard, tax_template_mapping, tax_template, context)
+
+            tax_id = tax_template_mapping.get(tax_template.id)
+            if not tax_id:
+                new_taxes += 1
+                vals_wiz = {
+                    'tax_id': tax_template.id,
+                    'update_chart_wizard_id': wizard.id,
+                    'type': 'new',
+                }
+                if not tax_template.parent_id:
+                    wiz_tax_facade.create(cr, uid, vals_wiz, context)
+                else:
+                    delay_wiz_tax.append(vals_wiz)
+            elif wizard.update_tax:
+                #
+                # Check the tax for changes.
+                #
+                modified = False
+                notes = ""
+                tax = tax_facade.browse(cr, uid, tax_id, context=context)
+
+                if tax.sequence != tax_template.sequence:
+                    notes += _("The sequence field is different.\n")
+                    modified = True
+                if tax.amount != tax_template.amount:
+                    notes += _("The amount field is different.\n")
+                    modified = True
+                if tax.type != tax_template.type:
+                    notes += _("The type field is different.\n")
+                    modified = True
+                if tax.applicable_type != tax_template.applicable_type:
+                    notes += _("The applicable type field is different.\n")
+                    modified = True
+                if tax.domain != tax_template.domain:
+                    notes += _("The domain field is different.\n")
+                    modified = True
+                if tax.child_depend != tax_template.child_depend:
+                    notes += _("The child depend field is different.\n")
+                    modified = True
+                if tax.python_compute != tax_template.python_compute:
+                    notes += _("The python compute field is different.\n")
+                    modified = True
+                # if tax.tax_group != tax_template.tax_group:
+                    # notes += _("The tax group field is different.\n")
+                    # modified = True
+                if tax.base_sign != tax_template.base_sign:
+                    notes += _("The base sign field is different.\n")
+                    modified = True
+                if tax.tax_sign != tax_template.tax_sign:
+                    notes += _("The tax sign field is different.\n")
+                    modified = True
+                if tax.include_base_amount != tax_template.include_base_amount:
+                    notes += _("The include base amount field is different.\n")
+                    modified = True
+                if tax.type_tax_use != tax_template.type_tax_use:
+                    notes += _("The type tax use field is different.\n")
+                    modified = True
+                # TODO: We could check other tax fields for changes...
+
+                if modified:
+                    #
+                    # Tax code to update.
+                    #
+                    updated_taxes += 1
+                    wiz_tax_facade.create(cr, uid, {
+                        'tax_id': tax_template.id,
+                        'update_chart_wizard_id': wizard.id,
+                        'type': 'updated',
+                        'update_tax_id': tax_id,
+                        'notes': notes,
+                    }, context)
+
+        for delay_vals_wiz in delay_wiz_tax:
+            wiz_tax_facade.create(cr, uid, delay_vals_wiz, context)
+
+        return {'new': new_taxes, 'updated': updated_taxes, 'mapping': tax_template_mapping}
+
+    def _find_accounts(self, cr, uid, wizard, context=None):
+        """
+        Search for, and load, account templates to create/update.
+        """
+        new_accounts = 0
+        updated_accounts = 0
+        account_template_mapping = {}
+
+        account_facade = self.pool.get('account.account')
+        account_template_facade = self.pool.get('account.account.template')
+        wiz_account_facade = self.pool.get(
+            'wizard.update.charts.accounts.account')
+
+        # Remove previous accounts
+        wiz_account_facade.unlink(
+            cr, uid, wiz_account_facade.search(cr, uid, []))
+
+        #
+        # Search for new / updated accounts
+        #
+        root_account_id = wizard.chart_template_id.account_root_id.id
+        children_acc_template = account_template_facade.search(cr, uid, [(
+            'parent_id', 'child_of', [root_account_id])], context=context)
+        children_acc_template.sort()
+        for account_template in account_template_facade.browse(cr, uid, children_acc_template, context=context):
+            # Ensure the account template is on the map (search for the mapped
+            # account id).
+            self._map_account_template(cr, uid, wizard, account_template_mapping, account_template, context)
+
+            account_id = account_template_mapping.get(account_template.id)
+            if not account_id:
+                new_accounts += 1
+                wiz_account_facade.create(cr, uid, {
+                    'account_id': account_template.id,
+                    'update_chart_wizard_id': wizard.id,
+                    'type': 'new',
+                }, context)
+            elif wizard.update_account:
+                #
+                # Check the account for changes.
+                #
+                modified = False
+                notes = ""
+                account = account_facade.browse(
+                    cr, uid, account_id, context=context)
+
+                if account.name != account_template.name and account.name != wizard.company_id.name:
+                    notes += _("The name is different.\n")
+                    modified = True
+                if account.type != account_template.type:
+                    notes += _("The type is different.\n")
+                    modified = True
+                if account.user_type != account_template.user_type:
+                    notes += _("The user type is different.\n")
+                    modified = True
+                if account.reconcile != account_template.reconcile:
+                    notes += _("The reconcile is different.\n")
+                    modified = True
+
+                # TODO: We could check other account fields for changes...
+
+                if modified:
+                    #
+                    # Account to update.
+                    #
+                    updated_accounts += 1
+                    wiz_account_facade.create(cr, uid, {
+                        'account_id': account_template.id,
+                        'update_chart_wizard_id': wizard.id,
+                        'type': 'updated',
+                        'update_account_id': account_id,
+                        'notes': notes,
+                    }, context)
+
+        return {'new': new_accounts, 'updated': updated_accounts, 'mapping': account_template_mapping}
+
+    def _find_fiscal_positions(self, cr, uid, wizard, context=None):
+        """
+        Search for, and load, fiscal position templates to create/update.
+        """
+        new_fps = 0
+        updated_fps = 0
+        fp_template_mapping = {}
+
+        fp_template_facade = self.pool.get('account.fiscal.position.template')
+        fp_facade = self.pool.get('account.fiscal.position')
+        wiz_fp_facade = self.pool.get(
+            'wizard.update.charts.accounts.fiscal.position')
+
+        # Remove previous fiscal positions
+        wiz_fp_facade.unlink(cr, uid, wiz_fp_facade.search(cr, uid, []))
+
+        #
+        # Search for new / updated fiscal positions
+        #
+        fp_template_ids = fp_template_facade.search(cr, uid, [('chart_template_id', '=', wizard.chart_template_id.id)], context=context)
+        for fp_template in fp_template_facade.browse(cr, uid, fp_template_ids, context=context):
+            # Ensure the fiscal position template is on the map (search for the
+            # mapped fiscal position id).
+            self._map_fp_template(
+                cr, uid, wizard, fp_template_mapping, fp_template, context)
+
+            fp_id = fp_template_mapping.get(fp_template.id)
+            if not fp_id:
+                #
+                # New fiscal position template.
+                #
+                new_fps += 1
+                wiz_fp_facade.create(cr, uid, {
+                    'fiscal_position_id': fp_template.id,
+                    'update_chart_wizard_id': wizard.id,
+                    'type': 'new',
+                }, context)
+            elif wizard.update_fiscal_position:
+                #
+                # Check the fiscal position for changes.
+                #
+                modified = False
+                notes = ""
+                fp = fp_facade.browse(cr, uid, fp_id, context=context)
+
+                #
+                # Check fiscal position taxes for changes.
+                #
+                if fp_template.tax_ids and fp.tax_ids:
+                    for fp_tax_template in fp_template.tax_ids:
+                        found = False
+                        for fp_tax in fp.tax_ids:
+                            if fp_tax.tax_src_id.name == fp_tax_template.tax_src_id.name:
+                                if fp_tax_template.tax_dest_id and fp_tax.tax_dest_id:
+                                    if fp_tax.tax_dest_id.name == fp_tax_template.tax_dest_id.name:
+                                        found = True
+                                        break
+                                elif not fp_tax_template.tax_dest_id and not fp_tax.tax_dest_id:
+                                    found = True
+                                    break
+                        if not found:
+                            if fp_tax_template.tax_dest_id:
+                                notes += _("Tax mapping not found on the fiscal position instance: %s -> %s.\n") % (fp_tax_template.tax_src_id.name, fp_tax_template.tax_dest_id.name)
+                            else:
+                                notes += _("Tax mapping not found on the fiscal position instance: %s -> None.\n") % fp_tax_template.tax_src_id.name
+                            modified = True
+                elif fp_template.tax_ids and not fp.tax_ids:
+                    notes += _("The template has taxes the fiscal position instance does not.\n")
+                    modified = True
+
+                #
+                # Check fiscal position accounts for changes.
+                #
+                if fp_template.account_ids and fp.account_ids:
+                    for fp_account_template in fp_template.account_ids:
+                        found = False
+                        for fp_account in fp.account_ids:
+                            if fp_account.account_src_id.name == fp_account_template.account_src_id.name:
+                                if fp_account.account_dest_id.name == fp_account_template.account_dest_id.name:
+                                    found = True
+                                    break
+                        if not found:
+                            notes += _("Account mapping not found on the fiscal position instance: %s -> %s.\n") % (fp_account_template.account_src_id.name, fp_account_template.account_dest_id.name)
+                            modified = True
+                elif fp_template.account_ids and not fp.account_ids:
+                    notes += _("The template has accounts the fiscal position instance does not.\n")
+                    modified = True
+
+                if modified:
+                    #
+                    # Fiscal position template to update.
+                    #
+                    updated_fps += 1
+                    wiz_fp_facade.create(cr, uid, {
+                        'fiscal_position_id': fp_template.id,
+                        'update_chart_wizard_id': wizard.id,
+                        'type': 'updated',
+                        'update_fiscal_position_id': fp_id,
+                        'notes': notes,
+                    }, context)
+
+        return {'new': new_fps, 'updated': updated_fps, 'mapping': fp_template_mapping}
+
+    def action_find_records(self, cr, uid, ids, context=None):
+        """
+        Searchs for records to update/create and shows them
+        """
+        if context is None:
+            context = {}
+        wizard = self.browse(cr, uid, ids[0], context=context)
+
+        if wizard.lang:
+            context['lang'] = wizard.lang
+        elif context.get('lang'):
+            del context['lang']
+
+        #
+        # Search for, and load, the records to create/update.
+        #
+        tax_codes_res = self._find_tax_codes(cr, uid, wizard, context=context)
+        taxes_res = self._find_taxes(cr, uid, wizard, context=context)
+        accounts_res = self._find_accounts(cr, uid, wizard, context=context)
+        fps_res = self._find_fiscal_positions(cr, uid, wizard, context=context)
+
+        #
+        # Write the results, and go to the next step.
+        #
+        self.write(cr, uid, [wizard.id], {
+            'state': 'ready',
+            'new_tax_codes': tax_codes_res.get('new', 0),
+            'new_taxes': taxes_res.get('new', 0),
+            'new_accounts': accounts_res.get('new', 0),
+            'new_fps': fps_res.get('new', 0),
+            'updated_tax_codes': tax_codes_res.get('updated', 0),
+            'updated_taxes': taxes_res.get('updated', 0),
+            'updated_accounts': accounts_res.get('updated', 0),
+            'updated_fps': fps_res.get('updated', 0),
+        }, context)
+
+        return True
+
+    ############################################################################
+    # Update records methods
+    ##########################################################################
+    def _update_tax_codes(self, cr, uid, wizard, log, context=None):
+        """
+        Search for, and load, tax code templates to create/update.
+        """
+        tax_code_facade = self.pool.get('account.tax.code')
+
+        root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
+
+        new_tax_codes = 0
+        updated_tax_codes = 0
+        tax_code_template_mapping = {}
+
+        for wiz_tax_code in wizard.tax_code_ids:
+            tax_code_template = wiz_tax_code.tax_code_id
+            tax_code_name = (root_tax_code_id == tax_code_template.id) and wizard.company_id.name or tax_code_template.name
+
+            # Ensure the parent tax code template is on the map.
+            self._map_tax_code_template(cr, uid, wizard, tax_code_template_mapping, tax_code_template.parent_id, context)
+
+            #
+            # Values
+            #
+            vals = {
+                'name': tax_code_name,
+                'code': tax_code_template.code,
+                'info': tax_code_template.info,
+                'parent_id': tax_code_template.parent_id and tax_code_template_mapping.get(tax_code_template.parent_id.id),
+                'company_id': wizard.company_id.id,
+                'sign': tax_code_template.sign,
+            }
+
+            tax_code_id = None
+            modified = False
+
+            if wiz_tax_code.type == 'new':
+                #
+                # Create the tax code
+                #
+                tax_code_id = tax_code_facade.create(cr, uid, vals)
+                log.add(_("Created tax code %s.\n") % tax_code_name)
+                new_tax_codes += 1
+                modified = True
+            elif wizard.update_tax_code and wiz_tax_code.update_tax_code_id:
+                #
+                # Update the tax code
+                #
+                tax_code_id = wiz_tax_code.update_tax_code_id.id
+                tax_code_facade.write(cr, uid, [tax_code_id], vals)
+                log.add(_("Updated tax code %s.\n") % tax_code_name)
+                updated_tax_codes += 1
+                modified = True
+            else:
+                tax_code_id = wiz_tax_code.update_tax_code_id and wiz_tax_code.update_tax_code_id.id
+                modified = False
+
+            # Store the tax codes on the map
+            tax_code_template_mapping[tax_code_template.id] = tax_code_id
+
+            if modified:
+                #
+                # Detect errors
+                #
+                if tax_code_template.parent_id and not tax_code_template_mapping.get(tax_code_template.parent_id.id):
+                    log.add(_("Tax code %s: The parent tax code %s can not be set.\n") % (tax_code_name, tax_code_template.parent_id.name), True)
+
+        return {
+            'new': new_tax_codes,
+            'updated': updated_tax_codes,
+            'mapping': tax_code_template_mapping
+        }
+
+    def _update_taxes(self, cr, uid, wizard, log, tax_code_template_mapping, context=None):
+        """
+        Search for, and load, tax templates to create/update.
+        """
+        tax_facade = self.pool.get('account.tax')
+
+        new_taxes = 0
+        updated_taxes = 0
+        tax_template_mapping = {}
+        taxes_pending_for_accounts = {}
+
+        for wiz_tax in wizard.tax_ids:
+            tax_template = wiz_tax.tax_id
+
+            # Ensure the parent tax template is on the map.
+            self._map_tax_template(cr, uid, wizard, tax_template_mapping,
+                                   tax_template.parent_id, context)
+
+            #
+            # Ensure the referenced tax codes are on the map.
+            #
+            tax_code_templates_to_find = [
+                tax_template.base_code_id,
+                tax_template.tax_code_id,
+                tax_template.ref_base_code_id,
+                tax_template.ref_tax_code_id
+            ]
+            for tax_code_template in [tmpl for tmpl in tax_code_templates_to_find if tmpl]:
+                self._map_tax_code_template(cr, uid, wizard, tax_code_template_mapping, tax_code_template)
+
+            #
+            # Values
+            #
+            vals_tax = {
+                'name': tax_template.name,
+                'sequence': tax_template.sequence,
+                'amount': tax_template.amount,
+                'type': tax_template.type,
+                'applicable_type': tax_template.applicable_type,
+                'domain': tax_template.domain,
+                'parent_id': tax_template.parent_id and tax_template_mapping.get(tax_template.parent_id.id),
+                'child_depend': tax_template.child_depend,
+                'python_compute': tax_template.python_compute,
+                'python_compute_inv': tax_template.python_compute_inv,
+                'python_applicable': tax_template.python_applicable,
+                #'tax_group': tax_template.tax_group,
+                'base_code_id': tax_template.base_code_id and tax_code_template_mapping.get(tax_template.base_code_id.id),
+                'tax_code_id': tax_template.tax_code_id and tax_code_template_mapping.get(tax_template.tax_code_id.id),
+                'base_sign': tax_template.base_sign,
+                'tax_sign': tax_template.tax_sign,
+                'ref_base_code_id': tax_template.ref_base_code_id and tax_code_template_mapping.get(tax_template.ref_base_code_id.id),
+                'ref_tax_code_id': tax_template.ref_tax_code_id and tax_code_template_mapping.get(tax_template.ref_tax_code_id.id),
+                'ref_base_sign': tax_template.ref_base_sign,
+                'ref_tax_sign': tax_template.ref_tax_sign,
+                'include_base_amount': tax_template.include_base_amount,
+                'description': tax_template.description,
+                'company_id': wizard.company_id.id,
+                'type_tax_use': tax_template.type_tax_use
+            }
+
+            tax_id = None
+            modified = False
+
+            if wiz_tax.type == 'new':
+                #
+                # Create a new tax.
+                #
+                tax_id = tax_facade.create(cr, uid, vals_tax)
+                log.add(_("Created tax %s.\n") % tax_template.name)
+                new_taxes += 1
+                modified = True
+            elif wizard.update_tax and wiz_tax.update_tax_id:
+                #
+                # Update a tax.
+                #
+                tax_id = wiz_tax.update_tax_id.id
+                tax_facade.write(cr, uid, [tax_id], vals_tax)
+                log.add(_("Updated tax %s.\n") % tax_template.name)
+                updated_taxes += 1
+                modified = True
+            else:
+                tax_id = wiz_tax.update_tax_id and wiz_tax.update_tax_id.id
+
+            # Update the tax template map
+            tax_template_mapping[tax_template.id] = tax_id
+
+            if modified:
+                #
+                # Add to the dict of taxes waiting for accounts.
+                #
+                taxes_pending_for_accounts[tax_id] = {
+                    'account_collected_id': tax_template.account_collected_id and tax_template.account_collected_id.id or False,
+                    'account_paid_id': tax_template.account_paid_id and tax_template.account_paid_id.id or False,
+                }
+
+                #
+                # Detect errors
+                #
+                if tax_template.parent_id and not tax_template_mapping.get(tax_template.parent_id.id):
+                    log.add(_("Tax %s: The parent tax %s can not be set.\n") % (tax_template.name, tax_template.parent_id.name), True)
+                if tax_template.base_code_id and not tax_code_template_mapping.get(tax_template.base_code_id.id):
+                    log.add(_("Tax %s: The tax code for the base %s can not be set.\n") % (tax_template.name, tax_template.base_code_id.name), True)
+                if tax_template.tax_code_id and not tax_code_template_mapping.get(tax_template.tax_code_id.id):
+                    log.add(_("Tax %s: The tax code for the tax %s can not be set.\n") % (tax_template.name, tax_template.tax_code_id.name), True)
+                if tax_template.ref_base_code_id and not tax_code_template_mapping.get(tax_template.ref_base_code_id.id):
+                    log.add(_("Tax %s: The tax code for the base refund %s can not be set.\n") % (tax_template.name, tax_template.ref_base_code_id.name), True)
+                if tax_template.ref_tax_code_id and not tax_code_template_mapping.get(tax_template.ref_tax_code_id.id):
+                    log.add(_("Tax %s: The tax code for the tax refund %s can not be set.\n") % (tax_template.name, tax_template.ref_tax_code_id.name), True)
+
+        return {
+            'new': new_taxes,
+            'updated': updated_taxes,
+            'mapping': tax_template_mapping,
+            'pending': taxes_pending_for_accounts
+        }
+
+    def _update_children_accounts_parent(self, cr, uid, wizard, log, parent_account_id, context=None):
+        """
+        Updates the parent_id of accounts that seem to be children of the
+        given account (accounts that start with the same code and are brothers
+        of the first account).
+        """
+        account_facade = self.pool.get('account.account')
+        parent_account = account_facade.browse(
+            cr, uid, parent_account_id, context=context)
+
+        if not parent_account.parent_id or not parent_account.code:
+            return False
+
+        children_ids = account_facade.search(cr, uid, [
+            ('company_id', '=',
+             parent_account.company_id and parent_account.company_id.id),
+            ('parent_id', '=', parent_account.parent_id.id),
+            ('code', '=like', "%s%%" % parent_account.code),
+            ('id', '!=', parent_account.id),
+        ], context=context)
+
+        if children_ids:
+            try:
+                account_facade.write(cr, uid, children_ids, {'parent_id':
+                                     parent_account.id}, context=context)
+            except osv.except_osv, ex:
+                log.add(_("Exception setting the parent of account %s children: %s - %s.\n") % (parent_account.code, ex.name, ex.value), True)
+
+        return True
+
+    def _update_accounts(self, cr, uid, wizard, log, tax_template_mapping, context=None):
+        """
+        Search for, and load, account templates to create/update.
+        """
+        account_facade = self.pool.get('account.account')
+
+        root_account_id = wizard.chart_template_id.account_root_id.id
+
+        # Disable the parent_store computing on account_account during the batch
+        # processing, we will force _parent_store_compute afterwards.
+        self.pool._init = True
+
+        new_accounts = 0
+        updated_accounts = 0
+        account_template_mapping = {}
+
+        for wiz_account in wizard.account_ids:
+            account_template = wiz_account.account_id
+
+            # Ensure the parent account template is on the map.
+            self._map_account_template(cr, uid, wizard, account_template_mapping, account_template.parent_id, context)
+
+            #
+            # Ensure the related tax templates are on the map.
+            #
+            for tax_template in account_template.tax_ids:
+                self._map_tax_template(cr, uid, wizard, tax_template_mapping,
+                                       tax_template, context)
+
+            # Get the tax ids
+            tax_ids = [tax_template_mapping[tax_template.id] for tax_template in account_template.tax_ids if tax_template_mapping[tax_template.id]]
+
+            #
+            # Calculate the account code (we need to add zeros to non-view
+            # account codes)
+            #
+            code = account_template.code or ''
+            if account_template.type != 'view':
+                if len(code) > 0 and len(code) <= wizard.code_digits:
+                    code = '%s%s' % (
+                        code, '0' * (wizard.code_digits - len(code)))
+
+            #
+            # Values
+            #
+            vals = {
+                'name': (root_account_id == account_template.id) and wizard.company_id.name or account_template.name,
+                #'sign': account_template.sign,
+                'currency_id': account_template.currency_id and account_template.currency_id.id or False,
+                'code': code,
+                'type': account_template.type,
+                'user_type': account_template.user_type and account_template.user_type.id or False,
+                'reconcile': account_template.reconcile,
+                'shortcut': account_template.shortcut,
+                'note': account_template.note,
+                'parent_id': account_template.parent_id and account_template_mapping.get(account_template.parent_id.id) or False,
+                'tax_ids': [(6, 0, tax_ids)],
+                'company_id': wizard.company_id.id,
+            }
+
+            account_id = None
+            modified = False
+
+            if wiz_account.type == 'new':
+                #
+                # Create the account
+                #
+                try:
+                    account_id = account_facade.create(cr, uid, vals)
+                    log.add(_("Created account %s.\n") % code)
+                    new_accounts += 1
+                    modified = True
+                except osv.except_osv, ex:
+                    log.add(_("Exception creating account %s: %s - %s.\n")
+                            % (code, ex.name, ex.value), True)
+            elif wizard.update_account and wiz_account.update_account_id:
+                #
+                # Update the account
+                #
+                account_id = wiz_account.update_account_id.id
+                try:
+                    account_facade.write(cr, uid, [account_id], vals)
+                    log.add(_("Updated account %s.\n") % code)
+                    updated_accounts += 1
+                    modified = True
+                except osv.except_osv, ex:
+                    log.add(_("Exception writing account %s: %s - %s.\n")
+                            % (code, ex.name, ex.value), True)
+            else:
+                account_id = wiz_account.update_account_id and wiz_account.update_account_id.id
+
+            # Store the account on the map
+            account_template_mapping[account_template.id] = account_id
+
+            if modified:
+                #
+                # Detect errors
+                #
+                if account_template.parent_id and not account_template_mapping.get(account_template.parent_id.id):
+                    log.add(_("Account %s: The parent account %s can not be set.\n") % (code, account_template.parent_id.code), True)
+
+                #
+                # Set this account as the parent of the accounts that seem to
+                # be its children (brothers starting with the same code).
+                #
+                if wizard.update_children_accounts_parent:
+                    self._update_children_accounts_parent(
+                        cr, uid, wizard, log, account_id, context=context)
+
+        #
+        # Reenable the parent_store computing on account_account
+        # and force the recomputation.
+        #
+        self.pool._init = False
+        self.pool.get('account.account')._parent_store_compute(cr)
+
+        return {
+            'new': new_accounts,
+            'updated': updated_accounts,
+            'mapping': account_template_mapping
+        }
+
+    def _update_taxes_pending_for_accounts(self, cr, uid, wizard, log, taxes_pending_for_accounts, account_template_mapping, context=None):
+        """
+        Updates the taxes (created or updated on previous steps) to set
+        the references to the accounts (the taxes where created/updated first,
+        when the referenced accounts where still not available).
+        """
+        tax_facade = self.pool.get('account.tax')
+        account_template_facade = self.pool.get('account.account.template')
+
+        for key, value in taxes_pending_for_accounts.items():
+            #
+            # Ensure the related account templates are on the map.
+            #
+            if value['account_collected_id']:
+                account_template = account_template_facade.browse(
+                    cr, uid, value['account_collected_id'], context=context)
+                self._map_account_template(cr, uid, wizard, account_template_mapping, account_template, context)
+            if value['account_paid_id']:
+                account_template = account_template_facade.browse(
+                    cr, uid, value['account_paid_id'], context=context)
+                self._map_account_template(cr, uid, wizard, account_template_mapping, account_template, context)
+
+            if value['account_collected_id'] or value['account_paid_id']:
+                if account_template_mapping.get(value['account_collected_id']) and account_template_mapping.get(value['account_paid_id']):
+                    vals = {
+                        'account_collected_id': account_template_mapping[value['account_collected_id']],
+                        'account_paid_id': account_template_mapping[value['account_paid_id']],
+                    }
+                    tax_facade.write(cr, uid, [key], vals)
+                else:
+                    tax = tax_facade.browse(cr, uid, key)
+                    if not account_template_mapping.get(value['account_collected_id']):
+                        log.add(_("Tax %s: The collected account can not be set.\n") % (tax.name), True)
+                    if not account_template_mapping.get(value['account_paid_id']):
+                        log.add(_("Tax %s: The paid account can not be set.\n")
+                                % (tax.name), True)
+
+    def _update_fiscal_positions(self, cr, uid, wizard, log, tax_template_mapping, account_template_mapping, context=None):
+        """
+        Search for, and load, fiscal position templates to create/update.
+        """
+        fp_facade = self.pool.get('account.fiscal.position')
+        fp_tax_facade = self.pool.get('account.fiscal.position.tax')
+        fp_account_facade = self.pool.get('account.fiscal.position.account')
+
+        new_fps = 0
+        updated_fps = 0
+
+        for wiz_fp in wizard.fiscal_position_ids:
+            fp_template = wiz_fp.fiscal_position_id
+
+            fp_id = None
+            modified = False
+            if wiz_fp.type == 'new':
+                #
+                # Create a new fiscal position
+                #
+                vals_fp = {
+                    'company_id': wizard.company_id.id,
+                    'name': fp_template.name,
+                }
+                fp_id = fp_facade.create(cr, uid, vals_fp)
+                new_fps += 1
+                modified = True
+            elif wizard.update_fiscal_position and wiz_fp.update_fiscal_position_id:
+                #
+                # Update the given fiscal position (remove the tax and account
+                # mappings, that will be regenerated later)
+                #
+                fp_id = wiz_fp.update_fiscal_position_id.id
+                updated_fps += 1
+                modified = True
+                # Remove the tax mappings
+                fp_tax_ids = fp_tax_facade.search(
+                    cr, uid, [('position_id', '=', fp_id)])
+                fp_tax_facade.unlink(cr, uid, fp_tax_ids)
+                # Remove the account mappings
+                fp_account_ids = fp_account_facade.search(
+                    cr, uid, [('position_id', '=', fp_id)])
+                fp_account_facade.unlink(cr, uid, fp_account_ids)
+            else:
+                fp_id = wiz_fp.update_fiscal_position_id and wiz_fp.update_fiscal_position_id.id
+
+            if modified:
+                #
+                # (Re)create the tax mappings
+                #
+                for fp_tax in fp_template.tax_ids:
+                    #
+                    # Ensure the related tax templates are on the map.
+                    #
+                    self._map_tax_template(cr, uid, wizard, tax_template_mapping, fp_tax.tax_src_id, context)
+                    if fp_tax.tax_dest_id:
+                        self._map_tax_template(cr, uid, wizard, tax_template_mapping, fp_tax.tax_dest_id, context)
+
+                    #
+                    # Create the fp tax mapping
+                    #
+                    vals_tax = {
+                        'tax_src_id': tax_template_mapping.get(fp_tax.tax_src_id.id),
+                        'tax_dest_id': fp_tax.tax_dest_id and tax_template_mapping.get(fp_tax.tax_dest_id.id),
+                        'position_id': fp_id,
+                    }
+                    fp_tax_facade.create(cr, uid, vals_tax)
+
+                    #
+                    # Check for errors
+                    #
+                    if not tax_template_mapping.get(fp_tax.tax_src_id.id):
+                        log.add(_("Fiscal position %s: The source tax %s can not be set.\n") % (fp_template.name, fp_tax.tax_src_id.code), True)
+                    if fp_tax.tax_dest_id and not tax_template_mapping.get(fp_tax.tax_dest_id.id):
+                        log.add(_("Fiscal position %s: The destination tax %s can not be set.\n") % (fp_template.name, fp_tax.tax_dest_id.name), True)
+                #
+                # (Re)create the account mappings
+                #
+                for fp_account in fp_template.account_ids:
+                    #
+                    # Ensure the related account templates are on the map.
+                    #
+                    self._map_account_template(cr, uid, wizard, account_template_mapping, fp_account.account_src_id, context)
+                    if fp_account.account_dest_id:
+                        self._map_account_template(cr, uid, wizard, account_template_mapping, fp_account.account_dest_id, context)
+
+                    #
+                    # Create the fp account mapping
+                    #
+                    vals_account = {
+                        'account_src_id': account_template_mapping.get(fp_account.account_src_id.id),
+                        'account_dest_id': fp_account.account_dest_id and account_template_mapping.get(fp_account.account_dest_id.id),
+                        'position_id': fp_id,
+                    }
+                    fp_account_facade.create(cr, uid, vals_account)
+
+                    #
+                    # Check for errors
+                    #
+                    if not account_template_mapping.get(fp_account.account_src_id.id):
+                        log.add(_("Fiscal position %s: The source account %s can not be set.\n") % (fp_template.name, fp_account.account_src_id.code), True)
+                    if fp_account.account_dest_id and not account_template_mapping.get(fp_account.account_dest_id.id):
+                        log.add(_("Fiscal position %s: The destination account %s can not be set.\n") % (fp_template.name, fp_account.account_dest_id.code), True)
+
+            log.add(_("Created or updated fiscal position %s.\n")
+                    % fp_template.name)
+        return {'new': new_fps, 'updated': updated_fps}
+
+    def action_update_records(self, cr, uid, ids, context=None):
+        """
+        Action that creates/updates the selected elements.
+        """
+        if context is None:
+            context = {}
+        wizard = self.browse(cr, uid, ids[0], context=context)
+
+        if wizard.lang:
+            context['lang'] = wizard.lang
+        elif context.get('lang'):
+            del context['lang']
+
+        log = WizardLog()
+
+        #
+        # Create or update the records.
+        #
+        tax_codes_res = self._update_tax_codes(
+            cr, uid, wizard, log, context=context)
+        taxes_res = self._update_taxes(
+            cr, uid, wizard, log, tax_codes_res['mapping'], context=context)
+        accounts_res = self._update_accounts(
+            cr, uid, wizard, log, taxes_res['pending'], context=context)
+        self._update_taxes_pending_for_accounts(cr, uid, wizard, log, taxes_res['pending'], accounts_res['mapping'], context=context)
+        fps_res = self._update_fiscal_positions(cr, uid, wizard, log, taxes_res['mapping'], accounts_res['mapping'], context=context)
+
+        #
+        # Check if errors where detected and wether we should stop.
+        #
+        if log.has_errors() and not wizard.continue_on_errors:
+            raise osv.except_osv(_('Error'), _(
+                "One or more errors detected!\n\n%s") % log.get_errors_str())
+
+        #
+        # Store the data and go to the next step.
+        #
+        self.write(cr, uid, [wizard.id], {
+            'state': 'done',
+            'new_tax_codes': tax_codes_res.get('new', 0),
+            'new_taxes': taxes_res.get('new', 0),
+            'new_accounts': accounts_res .get('new', 0),
+            'new_fps': fps_res.get('new', 0),
+            'updated_tax_codes': tax_codes_res.get('updated', 0),
+            'updated_taxes': taxes_res.get('updated', 0),
+            'updated_accounts': accounts_res.get('updated', 0),
+            'updated_fps': fps_res.get('updated', 0),
+            'log': log(),
+        }, context)
+
+        return True
+
+wizard_update_charts_accounts()
+
+
+class wizard_update_charts_accounts_tax_code(osv.osv_memory):
+    """
+    Tax code that needs to be updated (new or updated in the template).
+    """
+    _name = 'wizard.update.charts.accounts.tax.code'
+
+    _columns = {
+        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax code template', required=True),
+        'update_chart_wizard_id': fields.many2one('wizard.update.charts.accounts', 'Update chart wizard', required=True),
+        'type': fields.selection([
+        ('new', 'New template'),
+        ('updated', 'Updated template'),
+        ], 'Type'),
+        'update_tax_code_id': fields.many2one('account.tax.code', 'Tax code to update', required=False),
+        'notes': fields.text('Notes', readonly=True),
+    }
+
+    _defaults = {
+        #'update_tax_code_id': lambda *a: None,
+    }
+
+wizard_update_charts_accounts_tax_code()
+
+
+class wizard_update_charts_accounts_tax(osv.osv_memory):
+    """
+    Tax that needs to be updated (new or updated in the template).
+    """
+    _name = 'wizard.update.charts.accounts.tax'
+
+    _columns = {
+        'tax_id': fields.many2one('account.tax.template', 'Tax template', required=True),
+        'update_chart_wizard_id': fields.many2one('wizard.update.charts.accounts', 'Update chart wizard', required=True),
+        'type': fields.selection([
+        ('new', 'New template'),
+        ('updated', 'Updated template'),
+        ], 'Type'),
+        'update_tax_id': fields.many2one('account.tax', 'Tax to update', required=False),
+        'notes': fields.text('Notes', readonly=True),
+    }
+
+    _defaults = {
+        #'update_tax_id': lambda *a: None,
+    }
+
+wizard_update_charts_accounts_tax()
+
+
+class wizard_update_charts_accounts_account(osv.osv_memory):
+    """
+    Account that needs to be updated (new or updated in the template).
+    """
+    _name = 'wizard.update.charts.accounts.account'
+
+    # The chart of accounts can have a lot of accounts, so we need an higher
+    # limit for the objects in memory to let the wizard create all the items
+    # at once.
+    _max_count = 4096
+
+    _columns = {
+        'account_id': fields.many2one('account.account.template', 'Account template', required=True),
+        'update_chart_wizard_id': fields.many2one('wizard.update.charts.accounts', 'Update chart wizard', required=True),
+        'type': fields.selection([
+        ('new', 'New template'),
+        ('updated', 'Updated template'),
+        ], 'Type'),
+        'update_account_id': fields.many2one('account.account', 'Account to update', required=False),
+        'notes': fields.text('Notes', readonly=True),
+    }
+
+    _defaults = {
+        #'update_account_id': lambda *a: None,
+    }
+
+wizard_update_charts_accounts_account()
+
+
+class wizard_update_charts_accounts_fiscal_position(osv.osv_memory):
+    """
+    Fiscal position that needs to be updated (new or updated in the template).
+    """
+    _name = 'wizard.update.charts.accounts.fiscal.position'
+
+    _columns = {
+        'fiscal_position_id': fields.many2one('account.fiscal.position.template', 'Fiscal position template', required=True),
+        'update_chart_wizard_id': fields.many2one('wizard.update.charts.accounts', 'Update chart wizard', required=True),
+        'type': fields.selection([
+                    ('new', 'New template'),
+                    ('updated', 'Updated template'),
+                ], 'Type'),
+        'update_fiscal_position_id': fields.many2one('account.fiscal.position', 'Fiscal position to update', required=False),
+        'notes': fields.text('Notes', readonly=True),
+    }
+
+    _defaults = {
+        #'update_fiscal_position_id': lambda *a: None,
+    }
+
+
+wizard_update_charts_accounts_fiscal_position()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== added file 'account_chart_update/account_view.xml'
--- account_chart_update/account_view.xml	1970-01-01 00:00:00 +0000
+++ account_chart_update/account_view.xml	2012-12-07 10:00:37 +0000
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <!--  Wizard for Multi Charts of Accounts -->
+
+        <record id="view_update_multi_chart" model="ir.ui.view">
+            <field name="name">Update Chart of Accounts from a Chart Template</field>
+            <field name="model">wizard.update.charts.accounts</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Update Chart of Accounts from a Chart Template">
+                    <group col="4" colspan="4" attrs="{'invisible':[('state','!=','init')]}">
+                        <label string="This wizard will update your accounts, taxes and fiscal positions according to the selected chart template." colspan="4"/>
+                        <label string="" colspan="4"/>
+                        <group colspan="4">
+                            <separator col="4" colspan="4" string="Chart of Accounts"/>
+                            <field name="company_id" on_change="onchange_company_id(company_id)"/>
+                            <field name="code_digits"/>
+                            <field name="chart_template_id"/>
+                            <field name="lang"/>
+                        </group>
+                        <label string=""/>
+                        <group colspan="4">
+                            <separator string="Update records?" colspan="4"/>
+                            <group colspan="2" col="2">
+                                <field name="update_tax_code"/>
+                                <field name="update_tax"/>
+                                <field name="update_account"/>
+                                <field name="update_fiscal_position"/>
+                            </group>
+                            <group colspan="2">
+                                <label string="If you leave these options set, the wizard will not just create new records, but also update records with changes (i.e. different tax amount)." colspan="4" align="0.0"/>
+                                <label string="Note: Not all the fields are tested for changes, just the main ones." colspan="4" align="0.0"/>
+                            </group>
+                        </group>
+                        <group colspan="4">
+                            <separator string="Other options" colspan="4"/>
+                            <field name="update_children_accounts_parent"/>
+                            <field name="continue_on_errors"/>
+                        </group>
+                    </group>
+
+                    <group col="4" colspan="4" attrs="{'invisible':[('state','!=','ready')]}">
+                        <separator colspan="4" string="Records to create/update"/>
+                        <notebook colspan="4">
+                            <page string="Tax codes">
+                                <field name="tax_code_ids" colspan="4" nolabel="1" mode="tree,form" height="330">
+                                    <tree string="Tax codes" colors="red:type=='updated'">
+                                        <field name="tax_code_id"/>
+                                        <field name="update_tax_code_id"/>
+                                        <field name="type" invisible="1"/>
+                                    </tree>
+                                    <form string="Tax code">
+                                        <field name="tax_code_id" colspan="4"/>
+                                        <field name="type"/>
+                                        <field name="update_tax_code_id"/>
+                                        <separator string="Notes" colspan="4"/>
+                                        <field name="notes" colspan="4" nolabel="1"/>
+                                    </form>
+                                </field>
+                            </page>
+                            <page string="Taxes">
+                                <field name="tax_ids" colspan="4" nolabel="1" mode="tree,form" height="330">
+                                    <tree string="Taxes" colors="red:type=='updated'">
+                                        <field name="tax_id"/>
+                                        <field name="update_tax_id"/>
+                                        <field name="type" invisible="1"/>
+                                    </tree>
+                                    <form string="Tax">
+                                        <field name="tax_id" colspan="4"/>
+                                        <field name="type"/>
+                                        <field name="update_tax_id"/>
+                                        <separator string="Notes" colspan="4"/>
+                                        <field name="notes" colspan="4" nolabel="1"/>
+                                    </form>
+                                </field>
+                            </page>
+                            <page string="Accounts">
+                                <field name="account_ids" colspan="4" nolabel="1" mode="tree,form" height="330">
+                                    <tree string="Accounts" colors="red:type=='updated'">
+                                        <field name="account_id"/>
+                                        <field name="update_account_id"/>
+                                        <field name="type" invisible="1"/>
+                                    </tree>
+                                    <form string="Account">
+                                        <field name="account_id" colspan="4"/>
+                                        <field name="type"/>
+                                        <field name="update_account_id"/>
+                                        <separator string="Notes" colspan="4"/>
+                                        <field name="notes" colspan="4" nolabel="1"/>
+                                    </form>
+                                </field>
+                            </page>
+                            <page string="Fiscal positions">
+                                <field name="fiscal_position_ids" colspan="4" nolabel="1" mode="tree,form" height="330">
+                                    <tree string="Fiscal positions" colors="red:type=='updated'">
+                                        <field name="fiscal_position_id"/>
+                                        <field name="update_fiscal_position_id"/>
+                                        <field name="type" invisible="1"/>
+                                    </tree>
+                                    <form string="Fiscal position">
+                                        <field name="fiscal_position_id" colspan="4"/>
+                                        <field name="type"/>
+                                        <field name="update_fiscal_position_id"/>
+                                        <separator string="Notes" colspan="4"/>
+                                        <field name="notes" colspan="4" nolabel="1"/>
+                                    </form>
+                                </field>
+                            </page>
+                        </notebook>
+                    </group>
+
+                    <group col="4" colspan="4" attrs="{'invisible':[('state','!=','done'),]}">
+                        <separator colspan="4" string="Log"/>
+                        <field name="log" colspan="4" nolabel="1"/>
+                        <group colspan="4">
+                            <separator colspan="4" string="Summary of created objects"/>
+                            <field name="new_tax_codes"/>
+                            <field name="new_taxes"/>
+                            <field name="new_accounts"/>
+                            <field name="new_fps"/>
+                        </group>
+                        <group colspan="4">
+                            <separator colspan="4" string="Summary of updated objects"/>
+                            <field name="updated_tax_codes"/>
+                            <field name="updated_taxes"/>
+                            <field name="updated_accounts"/>
+                            <field name="updated_fps"/>
+                        </group>
+                    </group>
+
+                    <separator string="" colspan="4"/>
+                    <group col="8" colspan="4">
+                        <field name="state"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" states="init,ready"/>
+                        <button icon="gtk-go-forward" name="action_find_records" string="Next" type="object" states="init"/>
+                        <button icon="gtk-go-back" name="action_init" string="Previous" type="object" states="ready"/>
+                        <button icon="gtk-ok" name="action_update_records" string="Create/Update" type="object" states="ready"/>
+                        <button icon="gtk-ok" special="cancel" string="Ok" type="object" states="done"/>
+                    </group>
+
+                </form>
+            </field>
+        </record>
+
+        <record id="action_wizard_update_chart" model="ir.actions.act_window">
+            <field name="name">Update Chart of Accounts from a Chart Template</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">wizard.update.charts.accounts</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem parent="account.account_template_folder" action="action_wizard_update_chart" id="menu_wizard"/>
+
+    </data>
+</openerp>
 
=== added directory 'account_chart_update/i18n'
=== added file 'account_chart_update/i18n/account_chart_update.pot'
--- account_chart_update/i18n/account_chart_update.pot	1970-01-01 00:00:00 +0000
+++ account_chart_update/i18n/account_chart_update.pot	2012-12-07 10:00:37 +0000
@@ -0,0 +1,744 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_chart_update
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 5.0.10\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2010-06-10 15:41:54+0000\n"
+"PO-Revision-Date: 2010-06-10 15:41:54+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_chart_update
+#: field:wizard.update.charts.accounts,lang:0
+msgid "Language"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Created or updated fiscal position %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Exception creating account %s: %s - %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Exception writing account %s: %s - %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Exception setting the parent of account %s children: %s - %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Updated account %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Created account %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Created tax %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Updated tax %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Created tax code %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "Updated tax code %s.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "The template has accounts the fiscal position instance does not.\n"
+msgstr ""
+
+#. module: account_chart_update
+#: code:addons/account_chart_update/account.py:0
+#, python-format
+msgid "The base sign field is different.\n"