[MOV][IMP] analytic: reorganize addon, remove openerp tags and rename python classes

This commit is contained in:
fwi-odoo
2016-08-02 09:54:37 +02:00
committed by Thibault Delavallée
parent cf4a72ff39
commit 4f9c1c25f4
6 changed files with 14 additions and 16 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ that have no counterpart in the general financial accounts.
'data': [
'security/analytic_security.xml',
'security/ir.model.access.csv',
'views/analytic_view.xml',
'views/analytic_account_views.xml',
],
'demo': [
'data/analytic_demo.xml',
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<odoo>
<data noupdate="1">
<record id="analytic_absences" model="account.analytic.account">
<field name="name">Leaves</field>
@@ -70,4 +70,4 @@
<field name="name">Commercial &amp; Marketing</field>
</record>
</data>
</openerp>
</odoo>
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<odoo>
<data noupdate="1">
<record id="tag_contract" model="account.analytic.tag">
@@ -7,4 +7,4 @@
</record>
</data>
</openerp>
</odoo>
+2 -1
View File
@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import analytic
import analytic_account
@@ -1,17 +1,17 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from openerp import api, fields, models
from odoo import api, fields, models
class account_analytic_tag(models.Model):
class AccountAnalyticTag(models.Model):
_name = 'account.analytic.tag'
_description = 'Analytic Tags'
name = fields.Char(string='Analytic Tag', index=True, required=True)
color = fields.Integer('Color Index')
class account_analytic_account(models.Model):
class AccountAnalyticAccount(models.Model):
_name = 'account.analytic.account'
_inherit = ['mail.thread']
_description = 'Analytic Account'
@@ -74,7 +74,7 @@ class account_analytic_account(models.Model):
@api.model
def name_search(self, name='', args=None, operator='ilike', limit=100):
if operator not in ('ilike', 'like', '=', '=like', '=ilike'):
return super(account_analytic_account, self).name_search(name, args, operator, limit)
return super(AccountAnalyticAccount, self).name_search(name, args, operator, limit)
args = args or []
domain = ['|', ('code', operator, name), ('name', operator, name)]
partners = self.env['res.partner'].search([('name', operator, name)], limit=limit)
@@ -84,7 +84,7 @@ class account_analytic_account(models.Model):
return recs.name_get()
class account_analytic_line(models.Model):
class AccountAnalyticLine(models.Model):
_name = 'account.analytic.line'
_description = 'Analytic Line'
_order = 'date desc, id desc'
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<odoo>
<record id="account_analytic_tag_tree_view" model="ir.ui.view">
<field name="name">account.analytic.tag.tree</field>
<field name="model">account.analytic.tag</field>
@@ -267,6 +266,4 @@
</p>
</field>
</record>
</data>
</openerp>
</odoo>