From d91dd4d2fb623c651a819f2dd41ae2d376a8f0ad Mon Sep 17 00:00:00 2001
From: StefanRijnhart <stefan@therp.nl>
Date: Mon, 20 Apr 2015 13:47:55 +0200
Subject: [PATCH] [FIX] Don't remove company properties, but remove properties
 that refer to company records [IMP] Remove properties on account.journal (and
 other records) as well [IMP] Remove inactive records [ADD] Remove analytic
 lines [IMP] Inspect fiscal position lines (as the positions are not
 necessarily linked to a company)

---
 account_reset_chart/models/res_company.py | 31 +++++++++++++++++------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/account_reset_chart/models/res_company.py b/account_reset_chart/models/res_company.py
index d39a1e5e9..99204cc49 100644
--- a/account_reset_chart/models/res_company.py
+++ b/account_reset_chart/models/res_company.py
@@ -38,10 +38,23 @@ class Company(models.Model):
             logger.info('Unlinking all records of model %s for company %s',
                         model, self.name)
             try:
-                obj = self.env[model]
+                obj = self.env[model].with_context(active_test=False)
             except KeyError:
                 logger.info('Model %s not found', model)
                 return
+            self._cr.execute(
+                """
+                DELETE FROM ir_property ip
+                USING {table} tbl
+                WHERE value_reference = '{model},' || tbl.id
+                    AND tbl.company_id = %s;
+                """.format(model=model, table=obj._table),
+                (self.id,))
+            if self._cr.rowcount:
+                logger.info(
+                    "Unlinked %s properties that refer to records of type %s "
+                    "that are linked to company %s",
+                    self._cr.rowcount, model, self.name)
             records = obj.search([('company_id', '=', self.id)])
             if records:  # account_account.unlink() breaks on empty id list
                 records.unlink()
@@ -136,16 +149,18 @@ class Company(models.Model):
                    WHERE id IN %s""", (tuple(moves.ids),))
         moves.unlink()
 
+        self.env['account.fiscal.position.tax'].search(
+            ['|', ('tax_src_id.company_id', '=', self.id),
+             ('tax_dest_id.company_id', '=', self.id)]
+        ).unlink()
+        self.env['account.fiscal.position.account'].search(
+            ['|', ('account_src_id.company_id', '=', self.id),
+             ('account_dest_id.company_id', '=', self.id)]
+        ).unlink()
         unlink_from_company('account.fiscal.position')
+        unlink_from_company('account.analytic.line')
         unlink_from_company('account.tax')
         unlink_from_company('account.tax.code')
         unlink_from_company('account.journal')
-
-        logger.info('Unlink properties with account as values')
-        self._cr.execute(
-            """
-            DELETE FROM ir_property
-            WHERE value_reference LIKE 'account.account,%%'
-            AND company_id = %s""", (self.id,))
         unlink_from_company('account.account')
         return True