diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index 8156cf56ac5..889b2f9111b 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -38,6 +38,7 @@ Three reports are available: 'report/crossovered_budget_report_templates.xml', 'security/ir.model.access.csv', 'security/account_budget_security.xml', + 'views/account_analytic_account_views.xml', 'views/account_budget_views.xml', 'wizard/account_budget_analytic_views.xml', 'wizard/account_budget_report_views.xml', diff --git a/addons/account_budget/models/__init__.py b/addons/account_budget/models/__init__.py index 3b1e405ab8f..f2e78ebb530 100644 --- a/addons/account_budget/models/__init__.py +++ b/addons/account_budget/models/__init__.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -import account_budget \ No newline at end of file +import account_budget +import account_analytic_account \ No newline at end of file diff --git a/addons/account_budget/models/account_analytic_account.py b/addons/account_budget/models/account_analytic_account.py new file mode 100644 index 00000000000..ece8dde3b90 --- /dev/null +++ b/addons/account_budget/models/account_analytic_account.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from openerp.osv import fields, osv + +class account_analytic_account(osv.osv): + _inherit = "account.analytic.account" + + _columns = { + 'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'), + } diff --git a/addons/account_budget/models/account_budget.py b/addons/account_budget/models/account_budget.py index 727c7c0db89..04c9a7bffaf 100644 --- a/addons/account_budget/models/account_budget.py +++ b/addons/account_budget/models/account_budget.py @@ -203,9 +203,3 @@ class crossovered_budget_lines(osv.osv): } -class account_analytic_account(osv.osv): - _inherit = "account.analytic.account" - - _columns = { - 'crossovered_budget_line': fields.one2many('crossovered.budget.lines', 'analytic_account_id', 'Budget Lines'), - } diff --git a/addons/account_budget/views/account_analytic_account_views.xml b/addons/account_budget/views/account_analytic_account_views.xml new file mode 100644 index 00000000000..251009dce0b --- /dev/null +++ b/addons/account_budget/views/account_analytic_account_views.xml @@ -0,0 +1,40 @@ + + + + + account.analytic.account.form.inherit.budget + account.analytic.account + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+
+
+
+
+
+
\ No newline at end of file diff --git a/addons/account_budget/views/account_budget_views.xml b/addons/account_budget/views/account_budget_views.xml index d0d54e11d24..eecb862323b 100644 --- a/addons/account_budget/views/account_budget_views.xml +++ b/addons/account_budget/views/account_budget_views.xml @@ -267,42 +267,5 @@ src_model="account.analytic.account" id="act_account_analytic_account_cb_lines"/> - - - account.analytic.account.form.inherit.budget - account.analytic.account - - - - - - - - - - - - - - - - - - -
- - - - - - - - -
-
-
-
-
-