From 4061e117d2eaffaf1fdd6b7a165814c11198048b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 24 Dec 2014 00:23:39 +0100
Subject: [PATCH 01/10] [IMP] account_chart_update: search on code first to
 match tax codes

The tax code code should be more discriminant that the tax code name.
---
 .../wizard/wizard_chart_update.py             | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 891faf0db..7f73695f0 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -356,21 +356,19 @@ class wizard_update_charts_accounts(orm.TransientModel):
         # In other case
         tax_code_obj = self.pool['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_obj.search(cr, uid, [
-            ('name', '=', tax_code_name),
-            ('company_id', '=', wizard.company_id.id)
-        ], context=context)
-        if not tax_code_ids:
-            # if we could not match no tax code template name,
-            # try to match on tax code template code, if any
-            tax_code_code = tax_code_template.code
-            if tax_code_code:
-                tax_code_ids = tax_code_obj.search(cr, uid, [
-                    ('code', '=', tax_code_code),
-                    ('company_id', '=', wizard.company_id.id)
-                ], context=context)
+        tax_code_code = tax_code_template.code
+        if tax_code_code:
+            tax_code_ids = tax_code_obj.search(cr, uid, [
+                ('code', '=', tax_code_code),
+                ('company_id', '=', wizard.company_id.id)
+            ], context=context)
+        if not tax_code_code or not tax_code_ids:
+            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_obj.search(cr, uid, [
+                ('name', '=', tax_code_name),
+                ('company_id', '=', wizard.company_id.id)
+            ], context=context)
         tax_code_templ_mapping[tax_code_template.id] = (tax_code_ids and
                                                         tax_code_ids[0] or
                                                         False)

From 1899ce18077742940742f872263578872890ce7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 24 Dec 2014 00:39:11 +0100
Subject: [PATCH 02/10] [IMP] account_chart_update: compare more fields in tax
 codes

---
 .../wizard/wizard_chart_update.py              | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 7f73695f0..59d4bc2db 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -461,6 +461,9 @@ class wizard_update_charts_accounts(orm.TransientModel):
                 notes = ""
                 tax_code = tax_code_obj.browse(
                     cr, uid, tax_code_id, context=context)
+                if tax_code.name != tax_code_template.name:
+                    notes += _("The name field is different.\n")
+                    modified = True
                 if tax_code.code != tax_code_template.code:
                     notes += _("The code field is different.\n")
                     modified = True
@@ -470,7 +473,18 @@ class wizard_update_charts_accounts(orm.TransientModel):
                 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 tax_code.notprintable != tax_code_template.notprintable:
+                    notes += _("The notprintable field is different.\n")
+                    modified = True
+                if tax_code.sequence != tax_code_template.sequence:
+                    notes += _("The sequence field is different.\n")
+                    modified = True
+                if tax_code.parent_id.id != self._map_tax_code_template(
+                        cr, uid, wizard,
+                        tax_code_template_mapping,
+                        tax_code_template.parent_id, context=context):
+                    notes += _("The parent field is different.\n")
+                    modified = True
                 if modified:
                     # Tax code to update.
                     updated_tax_codes += 1
@@ -865,6 +879,8 @@ class wizard_update_charts_accounts(orm.TransientModel):
                               tax_code_template_mapping.get(p_id)),
                 'company_id': wizard.company_id.id,
                 'sign': tax_code_template.sign,
+                'notprintable': tax_code_template.notprintable,
+                'sequence': tax_code_template.sequence,
             }
             tax_code_id = None
             modified = False

From 64817c2eba56d3745a7ac1678ffd7dcaf3b5672b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 24 Dec 2014 08:19:53 +0100
Subject: [PATCH 03/10] [IMP] account_chart_update: deletion of tax codes
 removed from templates

For tax codes, it make sense to propose deletion, since tax codes
are normally defined by the tax authority and the user does not
customize them.
---
 .../wizard/wizard_chart_update.py             | 71 ++++++++++++++++++-
 .../wizard/wizard_chart_update_view.xml       |  4 ++
 2 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 59d4bc2db..369ef6fc1 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -194,6 +194,10 @@ class wizard_update_charts_accounts(orm.TransientModel):
             'Updated fiscal positions',
             readonly=True
         ),
+        'deleted_tax_codes': fields.integer(
+            'Deleted tax codes',
+            readonly=True
+        ),
         'log': fields.text('Messages and Errors', readonly=True)
     }
 
@@ -495,6 +499,54 @@ class wizard_update_charts_accounts(orm.TransientModel):
                         'update_tax_code_id': tax_code_id,
                         'notes': notes,
                     }, context)
+        # search for tax codes not in the template
+        # and propose them for deletion
+        tax_code_ids = tax_code_obj.\
+            search(cr, uid, [('company_id', '=', wizard.company_id.id)],
+                   context=context)
+        tax_code_ids = set(tax_code_ids)
+        template_tax_code_ids = tax_code_template_mapping.values()
+        template_tax_code_ids = set(template_tax_code_ids)
+        tax_code_ids_to_delete = tax_code_ids - template_tax_code_ids
+        if tax_code_ids_to_delete:
+            cr.execute("SELECT DISTINCT(tax_code_id) "
+                       "FROM account_move_line "
+                       "WHERE tax_code_id in %(tctd)s "
+                       "UNION "
+                       "SELECT DISTINCT(base_code_id) "
+                       "FROM account_tax "
+                       "WHERE base_code_id in %(tctd)s "
+                       "UNION "
+                       "SELECT DISTINCT(tax_code_id) "
+                       "FROM account_tax "
+                       "WHERE tax_code_id in %(tctd)s "
+                       "UNION "
+                       "SELECT DISTINCT(ref_base_code_id) "
+                       "FROM account_tax "
+                       "WHERE ref_base_code_id in %(tctd)s "
+                       "UNION "
+                       "SELECT DISTINCT(ref_tax_code_id) "
+                       "FROM account_tax "
+                       "WHERE ref_tax_code_id in %(tctd)s ",
+                       {'tctd': tuple(tax_code_ids_to_delete)})
+            # do not delete tax codes which are in use, and their parents
+            tax_code_ids_to_keep = set([row[0] for row in cr.fetchall()])
+            for tax_code in tax_code_obj.\
+                    browse(cr, uid, list(tax_code_ids_to_keep),
+                           context=context):
+                while tax_code.parent_id:
+                    tax_code_ids_to_keep.add(tax_code.parent_id.id)
+                    tax_code = tax_code.parent_id
+            for tax_code_id in tax_code_ids_to_delete - tax_code_ids_to_keep:
+                updated_tax_codes += 1
+                wiz_tax_code_obj.create(cr, uid, {
+                    'tax_code_id': False,
+                    'update_chart_wizard_id': wizard.id,
+                    'type': 'deleted',
+                    'update_tax_code_id': tax_code_id,
+                    'notes': "To delete: not in the template and unused",
+                }, context)
+
         return {
             'new': new_tax_codes,
             'updated': updated_tax_codes,
@@ -859,8 +911,12 @@ class wizard_update_charts_accounts(orm.TransientModel):
         root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
         new_tax_codes = 0
         updated_tax_codes = 0
+        deleted_tax_codes = 0
         tax_code_template_mapping = {}
+        # process new/updated
         for wiz_tax_code in wizard.tax_code_ids:
+            if wiz_tax_code.type == 'deleted':
+                continue
             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)
@@ -914,9 +970,17 @@ class wizard_update_charts_accounts(orm.TransientModel):
                             tax_code_name, tax_code_template.parent_id.name),
                         True
                     )
+        # process deleted
+        tax_code_ids_to_delete = [wtc.update_tax_code_id.id
+                                  for wtc in wizard.tax_code_ids
+                                  if wtc.type == 'deleted']
+        taxcodes.unlink(cr, uid, tax_code_ids_to_delete, context=context)
+        log.add(_("Deleted %d tax codes\n" % len(tax_code_ids_to_delete)))
+        deleted_tax_codes = len(tax_code_ids_to_delete)
         return {
             'new': new_tax_codes,
             'updated': updated_tax_codes,
+            'deleted': deleted_tax_codes,
             'mapping': tax_code_template_mapping
         }
 
@@ -1475,6 +1539,7 @@ class wizard_update_charts_accounts(orm.TransientModel):
             'updated_taxes': taxes_res.get('updated', 0),
             'updated_accounts': accounts_res.get('updated', 0),
             'updated_fps': fps_res.get('updated', 0),
+            'deleted_tax_codes': tax_codes_res.get('deleted', 0),
             'log': log(),
         }, context=context)
         return _reopen(self, wizard.id, 'wizard.update.chart.accounts')
@@ -1491,7 +1556,6 @@ class wizard_update_charts_accounts_tax_code(orm.TransientModel):
         'tax_code_id': fields.many2one(
             'account.tax.code.template',
             'Tax code template',
-            required=True,
             ondelete='set null'
         ),
         'update_chart_wizard_id': fields.many2one(
@@ -1501,8 +1565,9 @@ class wizard_update_charts_accounts_tax_code(orm.TransientModel):
             ondelete='cascade'
         ),
         'type': fields.selection([
-            ('new', 'New template'),
-            ('updated', 'Updated template'),
+            ('new', 'New tax code'),
+            ('updated', 'Updated tax code'),
+            ('deleted', 'Tax code to delete'),
         ], 'Type'),
         'update_tax_code_id': fields.many2one(
             'account.tax.code',
diff --git a/account_chart_update/wizard/wizard_chart_update_view.xml b/account_chart_update/wizard/wizard_chart_update_view.xml
index 91c7927d8..f4f1586e6 100644
--- a/account_chart_update/wizard/wizard_chart_update_view.xml
+++ b/account_chart_update/wizard/wizard_chart_update_view.xml
@@ -113,6 +113,10 @@
                             <field name="updated_accounts" />
                             <field name="updated_fps" />
                         </group>
+                        <group colspan="4">
+                            <separator colspan="4" string="Summary of deleted objects" />
+                            <field name="deleted_tax_codes" />
+                        </group>
                     </group>
 
                     <footer>

From 56045b4b29ee52c796b098404bbc1aba6973568b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 24 Dec 2014 13:17:52 +0100
Subject: [PATCH 04/10] [IMP] account_chart_update: update accounts on taxes
 even if an update of the account was not requested

Useful when the chart of taxes changes but the chart of account
need not be updated.
---
 account_chart_update/wizard/wizard_chart_update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 369ef6fc1..95157e615 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -1514,7 +1514,7 @@ class wizard_update_charts_accounts(orm.TransientModel):
             accounts_res = self._update_accounts(cr, uid, wizard, log,
                                                  taxes_res['mapping'],
                                                  context=context)
-        if wizard.update_tax and wizard.update_account:
+        if wizard.update_tax:
             self._update_taxes_pending_for_accounts(cr, uid, wizard, log,
                                                     taxes_res['pending'],
                                                     accounts_res['mapping'],

From 902b5ad1088383ddf489124dbe06ff6d6a7f5a5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 24 Dec 2014 14:28:19 +0100
Subject: [PATCH 05/10] [IMP] account_chart_update: depth-first search of tax
 codes

This helps creating parents before children.
---
 .../wizard/wizard_chart_update.py             | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 95157e615..38f2d67e1 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -418,6 +418,21 @@ class wizard_update_charts_accounts(orm.TransientModel):
         fp_templ_mapping[fp_template.id] = fp_ids and fp_ids[0] or False
         return fp_templ_mapping[fp_template.id]
 
+    def _get_depth_first_tax_code_template_ids(self, cr, uid, root_tax_code_id,
+                                               context=None):
+        tax_code_templ_obj = self.pool['account.tax.code.template']
+
+        def get_children(tct):
+            for child in tct.child_ids:
+                res.append(child.id)
+                get_children(child)
+
+        tct = tax_code_templ_obj.browse(cr, uid, root_tax_code_id,
+                                        context=context)
+        res = [tct.id]
+        get_children(tct)
+        return res
+
     def _find_tax_codes(self, cr, uid, wizard, chart_template_ids,
                         context=None):
         """
@@ -438,9 +453,9 @@ class wizard_update_charts_accounts(orm.TransientModel):
         wiz_tax_code_obj.unlink(cr, uid, wiz_tax_code_obj.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_obj.search(cr, uid, [(
-            'parent_id', 'child_of', [root_tax_code_id])], order='id',
-            context=context)
+        children_tax_code_template = \
+            self._get_depth_first_tax_code_template_ids(
+                cr, uid, root_tax_code_id, context=context)
         for tax_code_template in tax_code_templ_obj.browse(
                 cr, uid,
                 children_tax_code_template, context=context):

From ef00131d12485a67bb999c24dd695f5a50b6a891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 24 Dec 2014 15:03:42 +0100
Subject: [PATCH 06/10] [IMP] account_chart_update: compare more fields in
 taxes

---
 .../wizard/wizard_chart_update.py             | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 38f2d67e1..319162401 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -578,6 +578,8 @@ class wizard_update_charts_accounts(orm.TransientModel):
         new_taxes = 0
         updated_taxes = 0
         tax_templ_mapping = {}
+        tax_code_template_mapping = {}
+        acc_templ_mapping = {}
         tax_obj = self.pool['account.tax']
         tax_templ_obj = self.pool['account.tax.template']
         wiz_taxes_obj = self.pool['wizard.update.charts.accounts.tax']
@@ -648,6 +650,46 @@ class wizard_update_charts_accounts(orm.TransientModel):
                 if tax.type_tax_use != tax_templ.type_tax_use:
                     notes += _("The type tax use field is different.\n")
                     modified = True
+                # compare tax code fields
+                if tax.base_code_id.id != self._map_tax_code_template(
+                        cr, uid, wizard,
+                        tax_code_template_mapping,
+                        tax_templ.base_code_id, context=context):
+                    notes += _("The base_code_id field is different.\n")
+                    modified = True
+                if tax.tax_code_id.id != self._map_tax_code_template(
+                        cr, uid, wizard,
+                        tax_code_template_mapping,
+                        tax_templ.tax_code_id, context=context):
+                    notes += _("The tax_code_id field is different.\n")
+                    modified = True
+                if tax.ref_base_code_id.id != self._map_tax_code_template(
+                        cr, uid, wizard,
+                        tax_code_template_mapping,
+                        tax_templ.ref_base_code_id, context=context):
+                    notes += _("The ref_base_code_id field is different.\n")
+                    modified = True
+                if tax.ref_tax_code_id.id != self._map_tax_code_template(
+                        cr, uid, wizard,
+                        tax_code_template_mapping,
+                        tax_templ.ref_tax_code_id, context=context):
+                    notes += _("The ref_tax_code_id field is different.\n")
+                    modified = True
+                # compare tax account fields
+                if tax.account_paid_id.id != self._map_account_template(
+                        cr, uid, wizard,
+                        acc_templ_mapping,
+                        tax_templ.account_paid_id,
+                        context=context):
+                    notes += _("The account_paid field is different.\n")
+                    modified = True
+                if tax.account_collected_id.id != self._map_account_template(
+                        cr, uid, wizard,
+                        acc_templ_mapping,
+                        tax_templ.account_collected_id,
+                        context=context):
+                    notes += _("The account_collected field is different.\n")
+                    modified = True
                 # TODO: We could check other tax fields for changes...
                 if modified:
                     # Tax code to update.

From 321a6b234fc375174d21979559c3dcb30694da49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Fri, 26 Dec 2014 19:07:46 +0100
Subject: [PATCH 07/10] [IMP] account_chart_update: add active field on tax
 code

Deactivate tax codes which are not in the template.
---
 account_chart_update/__init__.py              |  2 +
 account_chart_update/model/__init__.py        |  1 +
 .../model/account_tax_code.py                 | 27 +++++++++
 .../wizard/wizard_chart_update.py             | 56 +++++--------------
 4 files changed, 44 insertions(+), 42 deletions(-)
 create mode 100644 account_chart_update/model/__init__.py
 create mode 100644 account_chart_update/model/account_tax_code.py

diff --git a/account_chart_update/__init__.py b/account_chart_update/__init__.py
index d04374b71..4319b4213 100644
--- a/account_chart_update/__init__.py
+++ b/account_chart_update/__init__.py
@@ -23,4 +23,6 @@
 """
 Account Chart Update Wizard
 """
+
+from . import model
 from . import wizard
diff --git a/account_chart_update/model/__init__.py b/account_chart_update/model/__init__.py
new file mode 100644
index 000000000..a7362088a
--- /dev/null
+++ b/account_chart_update/model/__init__.py
@@ -0,0 +1 @@
+from . import account_tax_code
diff --git a/account_chart_update/model/account_tax_code.py b/account_chart_update/model/account_tax_code.py
new file mode 100644
index 000000000..ae68fd812
--- /dev/null
+++ b/account_chart_update/model/account_tax_code.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (c) 2014 ACSONE SA/NV (http://acsone.eu)
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp import models, fields
+
+
+class AccountTaxCode(models.Model):
+    _inherit = 'account.tax.code'
+
+    active = fields.Boolean('Active', default=True)
diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 319162401..0c5721514 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -520,47 +520,17 @@ class wizard_update_charts_accounts(orm.TransientModel):
             search(cr, uid, [('company_id', '=', wizard.company_id.id)],
                    context=context)
         tax_code_ids = set(tax_code_ids)
-        template_tax_code_ids = tax_code_template_mapping.values()
-        template_tax_code_ids = set(template_tax_code_ids)
+        template_tax_code_ids = set(tax_code_template_mapping.values())
         tax_code_ids_to_delete = tax_code_ids - template_tax_code_ids
-        if tax_code_ids_to_delete:
-            cr.execute("SELECT DISTINCT(tax_code_id) "
-                       "FROM account_move_line "
-                       "WHERE tax_code_id in %(tctd)s "
-                       "UNION "
-                       "SELECT DISTINCT(base_code_id) "
-                       "FROM account_tax "
-                       "WHERE base_code_id in %(tctd)s "
-                       "UNION "
-                       "SELECT DISTINCT(tax_code_id) "
-                       "FROM account_tax "
-                       "WHERE tax_code_id in %(tctd)s "
-                       "UNION "
-                       "SELECT DISTINCT(ref_base_code_id) "
-                       "FROM account_tax "
-                       "WHERE ref_base_code_id in %(tctd)s "
-                       "UNION "
-                       "SELECT DISTINCT(ref_tax_code_id) "
-                       "FROM account_tax "
-                       "WHERE ref_tax_code_id in %(tctd)s ",
-                       {'tctd': tuple(tax_code_ids_to_delete)})
-            # do not delete tax codes which are in use, and their parents
-            tax_code_ids_to_keep = set([row[0] for row in cr.fetchall()])
-            for tax_code in tax_code_obj.\
-                    browse(cr, uid, list(tax_code_ids_to_keep),
-                           context=context):
-                while tax_code.parent_id:
-                    tax_code_ids_to_keep.add(tax_code.parent_id.id)
-                    tax_code = tax_code.parent_id
-            for tax_code_id in tax_code_ids_to_delete - tax_code_ids_to_keep:
-                updated_tax_codes += 1
-                wiz_tax_code_obj.create(cr, uid, {
-                    'tax_code_id': False,
-                    'update_chart_wizard_id': wizard.id,
-                    'type': 'deleted',
-                    'update_tax_code_id': tax_code_id,
-                    'notes': "To delete: not in the template and unused",
-                }, context)
+        for tax_code_id in tax_code_ids_to_delete:
+            updated_tax_codes += 1
+            wiz_tax_code_obj.create(cr, uid, {
+                'tax_code_id': False,
+                'update_chart_wizard_id': wizard.id,
+                'type': 'deleted',
+                'update_tax_code_id': tax_code_id,
+                'notes': "To deactivate: not in the template",
+            }, context)
 
         return {
             'new': new_tax_codes,
@@ -1031,8 +1001,10 @@ class wizard_update_charts_accounts(orm.TransientModel):
         tax_code_ids_to_delete = [wtc.update_tax_code_id.id
                                   for wtc in wizard.tax_code_ids
                                   if wtc.type == 'deleted']
-        taxcodes.unlink(cr, uid, tax_code_ids_to_delete, context=context)
-        log.add(_("Deleted %d tax codes\n" % len(tax_code_ids_to_delete)))
+        taxcodes.write(cr, uid, tax_code_ids_to_delete,
+                       {'active': False},
+                       context=context)
+        log.add(_("Deactivated %d tax codes\n" % len(tax_code_ids_to_delete)))
         deleted_tax_codes = len(tax_code_ids_to_delete)
         return {
             'new': new_tax_codes,

From a5431bf3dfa5bdb30cfb62b202f90e9ea1810640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Fri, 26 Dec 2014 23:29:08 +0100
Subject: [PATCH 08/10] [IMP] account_chart_update: deactivate taxes that are
 not in the template

---
 .../wizard/wizard_chart_update.py             | 41 +++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 0c5721514..1da00b225 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -195,7 +195,11 @@ class wizard_update_charts_accounts(orm.TransientModel):
             readonly=True
         ),
         'deleted_tax_codes': fields.integer(
-            'Deleted tax codes',
+            'Deactivated tax codes',
+            readonly=True
+        ),
+        'deleted_taxes': fields.integer(
+            'Deactivated taxes',
             readonly=True
         ),
         'log': fields.text('Messages and Errors', readonly=True)
@@ -673,6 +677,23 @@ class wizard_update_charts_accounts(orm.TransientModel):
                     }, context)
         for delay_vals_wiz in delay_wiz_tax:
             wiz_taxes_obj.create(cr, uid, delay_vals_wiz, context)
+        # search for taxes not in the template
+        # and propose them for deletion
+        tax_ids = tax_obj.\
+            search(cr, uid, [('company_id', '=', wizard.company_id.id)],
+                   context=context)
+        tax_ids = set(tax_ids)
+        template_tax_ids = set(tax_templ_mapping.values())
+        tax_ids_to_delete = tax_ids - template_tax_ids
+        for tax_id in tax_ids_to_delete:
+            updated_taxes += 1
+            wiz_taxes_obj.create(cr, uid, {
+                'tax_id': False,
+                'update_chart_wizard_id': wizard.id,
+                'type': 'deleted',
+                'update_tax_id': tax_id,
+                'notes': "To deactivate: not in the template",
+            }, context)
 
         return {'new': new_taxes,
                 'updated': updated_taxes,
@@ -938,7 +959,6 @@ class wizard_update_charts_accounts(orm.TransientModel):
         root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
         new_tax_codes = 0
         updated_tax_codes = 0
-        deleted_tax_codes = 0
         tax_code_template_mapping = {}
         # process new/updated
         for wiz_tax_code in wizard.tax_code_ids:
@@ -1024,6 +1044,8 @@ class wizard_update_charts_accounts(orm.TransientModel):
         tax_template_mapping = {}
         taxes_pending_for_accounts = {}
         for wiz_tax in wizard.tax_ids:
+            if wiz_tax.type == 'deleted':
+                continue
             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,
@@ -1165,9 +1187,19 @@ class wizard_update_charts_accounts(orm.TransientModel):
                         ),
                         True
                     )
+        # process deleted
+        tax_ids_to_delete = [wtc.update_tax_id.id
+                             for wtc in wizard.tax_ids
+                             if wtc.type == 'deleted']
+        taxes.write(cr, uid, tax_ids_to_delete,
+                    {'active': False},
+                    context=context)
+        log.add(_("Deactivated %d taxes\n" % len(tax_ids_to_delete)))
+        deleted_taxes = len(tax_ids_to_delete)
         return {
             'new': new_taxes,
             'updated': updated_taxes,
+            'deleted': deleted_taxes,
             'mapping': tax_template_mapping,
             'pending': taxes_pending_for_accounts
         }
@@ -1569,6 +1601,7 @@ class wizard_update_charts_accounts(orm.TransientModel):
             'updated_accounts': accounts_res.get('updated', 0),
             'updated_fps': fps_res.get('updated', 0),
             'deleted_tax_codes': tax_codes_res.get('deleted', 0),
+            'deleted_taxes': taxes_res.get('deleted', 0),
             'log': log(),
         }, context=context)
         return _reopen(self, wizard.id, 'wizard.update.chart.accounts')
@@ -1596,7 +1629,7 @@ class wizard_update_charts_accounts_tax_code(orm.TransientModel):
         'type': fields.selection([
             ('new', 'New tax code'),
             ('updated', 'Updated tax code'),
-            ('deleted', 'Tax code to delete'),
+            ('deleted', 'Tax code to deactivate'),
         ], 'Type'),
         'update_tax_code_id': fields.many2one(
             'account.tax.code',
@@ -1621,7 +1654,6 @@ class wizard_update_charts_accounts_tax(orm.TransientModel):
         'tax_id': fields.many2one(
             'account.tax.template',
             'Tax template',
-            required=True,
             ondelete='set null'
         ),
         'update_chart_wizard_id': fields.many2one(
@@ -1633,6 +1665,7 @@ class wizard_update_charts_accounts_tax(orm.TransientModel):
         'type': fields.selection([
             ('new', 'New template'),
             ('updated', 'Updated template'),
+            ('deleted', 'Tax to deactivate'),
         ], 'Type'),
         'update_tax_id': fields.many2one(
             'account.tax',

From 321010b16cdcde8a97c74cfda71fd968de551cea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 14 Jan 2015 19:06:07 +0100
Subject: [PATCH 09/10] [FIX] account_chart_update: multi-company criteria for
 taxes

---
 account_chart_update/wizard/wizard_chart_update.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index 1da00b225..ade6a73d7 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -345,6 +345,7 @@ class wizard_update_charts_accounts(orm.TransientModel):
             criteria = (['|', '|'] + criteria +
                         [('description', '=', tax_templ.description),
                          ('name', '=', tax_templ.description)])
+        criteria += [('company_id', '=', wizard.company_id.id)]
         tax_ids = tax_obj.search(cr, uid, criteria, context=context)
         tax_templ_mapping[tax_templ.id] = tax_ids and tax_ids[0] or False
         return tax_templ_mapping[tax_templ.id]

From 90c240fb1f0ee803d1b4ac33ffb5cc1920e88875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= <stephane.bidoul@acsone.eu>
Date: Wed, 14 Jan 2015 19:22:05 +0100
Subject: [PATCH 10/10] [IMP] account_chart_update: avoid inserting duplicates
 in presence of inactive taxes or tax codes

---
 account_chart_update/wizard/wizard_chart_update.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/account_chart_update/wizard/wizard_chart_update.py b/account_chart_update/wizard/wizard_chart_update.py
index ade6a73d7..79efc3f29 100644
--- a/account_chart_update/wizard/wizard_chart_update.py
+++ b/account_chart_update/wizard/wizard_chart_update.py
@@ -346,7 +346,10 @@ class wizard_update_charts_accounts(orm.TransientModel):
                         [('description', '=', tax_templ.description),
                          ('name', '=', tax_templ.description)])
         criteria += [('company_id', '=', wizard.company_id.id)]
-        tax_ids = tax_obj.search(cr, uid, criteria, context=context)
+        # search inactive taxes too, to avoid re-creating
+        # taxes that have been deactivated before
+        search_context = dict(context, active_test=False)
+        tax_ids = tax_obj.search(cr, uid, criteria, context=search_context)
         tax_templ_mapping[tax_templ.id] = tax_ids and tax_ids[0] or False
         return tax_templ_mapping[tax_templ.id]
 
@@ -362,7 +365,10 @@ class wizard_update_charts_accounts(orm.TransientModel):
             return False
         if tax_code_templ_mapping.get(tax_code_template.id):
             return tax_code_templ_mapping[tax_code_template.id]
-        # In other case
+        # prepare a search context in order to
+        # search inactive tax codes too, to avoid re-creating
+        # tax codes that have been deactivated before
+        search_context = dict(context, active_test=False)
         tax_code_obj = self.pool['account.tax.code']
         root_tax_code_id = wizard.chart_template_id.tax_code_root_id.id
         tax_code_code = tax_code_template.code
@@ -370,14 +376,14 @@ class wizard_update_charts_accounts(orm.TransientModel):
             tax_code_ids = tax_code_obj.search(cr, uid, [
                 ('code', '=', tax_code_code),
                 ('company_id', '=', wizard.company_id.id)
-            ], context=context)
+            ], context=search_context)
         if not tax_code_code or not tax_code_ids:
             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_obj.search(cr, uid, [
                 ('name', '=', tax_code_name),
                 ('company_id', '=', wizard.company_id.id)
-            ], context=context)
+            ], context=search_context)
         tax_code_templ_mapping[tax_code_template.id] = (tax_code_ids and
                                                         tax_code_ids[0] or
                                                         False)