diff --git a/addons/analytic/__openerp__.py b/addons/analytic/__openerp__.py index 19bd3d2efbfe47ef7453ab8c5c6825100c173de1..5618b4c602325d1aaf9ffdadd2827b6c928a0ff2 100644 --- a/addons/analytic/__openerp__.py +++ b/addons/analytic/__openerp__.py @@ -19,7 +19,6 @@ that have no counterpart in the general financial accounts. 'security/analytic_security.xml', 'security/ir.model.access.csv', 'views/analytic_view.xml', - 'data/analytic_data.xml', 'wizard/account_analytic_chart_view.xml', ], 'demo': [ diff --git a/addons/analytic/data/analytic_data.xml b/addons/analytic/data/analytic_data.xml deleted file mode 100644 index 193e4978e94bd92fe464d131be2f2211e23214ba..0000000000000000000000000000000000000000 --- a/addons/analytic/data/analytic_data.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<openerp> - <data noupdate="1"> - - <!-- Analytic-account-related subtypes for messaging / Chatter --> - <record id="mt_account_pending" model="mail.message.subtype"> - <field name="name">Contract to Renew</field> - <field name="res_model">account.analytic.account</field> - <field name="default" eval="False"/> - <field name="description">Pending</field> - </record> - <record id="mt_account_closed" model="mail.message.subtype"> - <field name="name">Contract Finished</field> - <field name="res_model">account.analytic.account</field> - <field name="default" eval="False"/> - <field name="description">Closed</field> - </record> - <record id="mt_account_opened" model="mail.message.subtype"> - <field name="name">Contract Opened</field> - <field name="res_model">account.analytic.account</field> - <field name="default" eval="False"/> - <field name="description">Opened</field> - </record> - - </data> -</openerp> diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic.py index 1ea482e1601df6f88eedc745c0ad1d5c102c3f9a..377871904c2782af94ecf0779c96563a58d83f5d 100644 --- a/addons/analytic/models/analytic.py +++ b/addons/analytic/models/analytic.py @@ -77,17 +77,6 @@ class account_analytic_account(models.Model): recs = self.search(['|', '|', ('code', operator, name), ('partner_id', operator, name), ('name', operator, name)] + args, limit=limit) return recs.name_get() - @api.multi - def _track_subtype(self, init_values): - self.ensure_one() - if 'state' in init_values and self.state == 'open': - return 'analytic.mt_account_opened' - elif 'state' in init_values and self.state == 'close': - return 'analytic.mt_account_closed' - elif 'state' in init_values and self.state == 'pending': - return 'analytic.mt_account_pending' - return super(account_analytic_account, self)._track_subtype(init_values) - class account_analytic_line(models.Model): _name = 'account.analytic.line'