diff --git a/account_cost_center/README.rst b/account_cost_center/README.rst index 2da46954c..ea9eab694 100644 --- a/account_cost_center/README.rst +++ b/account_cost_center/README.rst @@ -1,74 +1,109 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 +========== +Costcenter +========== -=========== -Cost Center -=========== +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Faccount--financial--tools-lightgray.png?logo=github + :target: https://github.com/OCA/account-financial-tools/tree/10.0/account_cost_center + :alt: OCA/account-financial-tools +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-financial-tools-10-0/account-financial-tools-10-0-account_cost_center + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/92/10.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| This module allows the user to link every invoice line to a cost center providing an extra dimension for the analysis. +**Table of contents** + +.. contents:: + :local: Usage ===== This module is relevant when you are creating sales invoices and using analytic accounting. -Start using cost centers by defining the cost centers. Be aware that Analytic Accounting must be activated on the user for the following menu option. +Start using cost centers by defining the cost centers. Be aware that Analytic Accounting +must be activated on the user for the following menu option. Use the menu in the accounting module: **Configuration > Analytics accounting > Cost centers** -Once defined you can add a cost center to an invoice line. A default cost center for the current invoice can be set in the other info tab. +.. figure:: static/description/account_costcenter_1.png + :alt: Cost centers can be configured + :align: center -This module adds the cost center concept to the reporting module. +Once defined you can add a cost center to an invoice line. A default cost center for +the current invoice can be set in the other info tab. + +.. figure:: static/description/account_costcenter_2.png + :alt: Cost centers can be selected on invoice lines + :align: center + +This module adds the cost center concept to the reporting. **Accounting > Invoice Analysis** Here you can select or unselect the cost center within your analysis. - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/92/8.0 - +.. figure:: static/description/account_costcenter_3.png + :alt: Cost centers can be selected on invoice lines + :align: center Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Images ------- +Authors +~~~~~~~ -* Odoo Community Association: `Icon `_. +* Onestein Contributors ------------- +~~~~~~~~~~~~ * Kevin Graveman * Richard Dijkstra * Andrea Stirpe * Antonio Esposito -Maintainer ----------- +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -This module is maintained by the OCA. - OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit https://odoo-community.org. +This module is part of the `OCA/account-financial-tools `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_cost_center/__init__.py b/account_cost_center/__init__.py index 218dd5b99..b44d76594 100644 --- a/account_cost_center/__init__.py +++ b/account_cost_center/__init__.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2017 Onestein () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import models diff --git a/account_cost_center/__openerp__.py b/account_cost_center/__manifest__.py similarity index 61% rename from account_cost_center/__openerp__.py rename to account_cost_center/__manifest__.py index 854cdff28..71d35e2fb 100644 --- a/account_cost_center/__openerp__.py +++ b/account_cost_center/__manifest__.py @@ -1,21 +1,22 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2017 Onestein () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2016-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { 'name': 'Costcenter', 'summary': 'Cost center information for invoice lines', - 'author': 'ONESTEiN BV,Odoo Community Association (OCA)', + 'author': 'Onestein, Odoo Community Association (OCA)', 'license': 'AGPL-3', - 'website': 'http://www.onestein.eu', + 'website': 'https://github.com/OCA/account-financial-tools/', 'category': 'Accounting', - 'version': '8.0.1.0.0', + 'version': '10.0.1.0.0', 'depends': [ 'account', 'base_view_inheritance_extension' ], 'data': [ 'security/ir.model.access.csv', + 'security/account_cost_center_security.xml', 'views/account_cost_center.xml', 'views/account_move.xml', 'views/account_move_line.xml', diff --git a/account_cost_center/models/__init__.py b/account_cost_center/models/__init__.py index de7ebfff4..caabea9a2 100644 --- a/account_cost_center/models/__init__.py +++ b/account_cost_center/models/__init__.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2017 Onestein () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import account_move_line from . import account_invoice diff --git a/account_cost_center/models/account_cost_center.py b/account_cost_center/models/account_cost_center.py index 8347f3695..3f8caaa16 100644 --- a/account_cost_center/models/account_cost_center.py +++ b/account_cost_center/models/account_cost_center.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2017 Onestein () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from openerp import fields, models +from odoo import fields, models class AccountCostCenter(models.Model): @@ -12,8 +12,7 @@ class AccountCostCenter(models.Model): name = fields.Char(string='Title', required=True) code = fields.Char(required=True) company_id = fields.Many2one( - comodel_name='res.company', + 'res.company', string='Company', - required=True, default=lambda self: self.env.user.company_id ) diff --git a/account_cost_center/models/account_invoice.py b/account_cost_center/models/account_invoice.py index b583b0396..fa86d4d25 100644 --- a/account_cost_center/models/account_invoice.py +++ b/account_cost_center/models/account_invoice.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2017 Onestein () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from openerp import api, fields, models +from odoo import api, fields, models class AccountInvoice(models.Model): @@ -15,8 +15,20 @@ class AccountInvoice(models.Model): ) @api.model - def line_get_convert(self, line, part, date): - res = super(AccountInvoice, self).line_get_convert(line, part, date) + def line_get_convert(self, line, part): + res = super(AccountInvoice, self).line_get_convert(line, part) if line.get('cost_center_id'): res['cost_center_id'] = line['cost_center_id'] return res + + @api.model + def invoice_line_move_line_get(self): + res = super(AccountInvoice, self).invoice_line_move_line_get() + + for dict_data in res: + invl_id = dict_data.get('invl_id') + line = self.env['account.invoice.line'].browse(invl_id) + if line.cost_center_id: + dict_data['cost_center_id'] = line.cost_center_id.id + + return res diff --git a/account_cost_center/models/account_invoice_line.py b/account_cost_center/models/account_invoice_line.py index 310cf7bed..baa381473 100644 --- a/account_cost_center/models/account_invoice_line.py +++ b/account_cost_center/models/account_invoice_line.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2017 Onestein () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from openerp import api, fields, models +from odoo import api, fields, models class AccountInvoiceLine(models.Model): @@ -17,12 +17,5 @@ class AccountInvoiceLine(models.Model): 'account.cost.center', string='Cost Center', index=True, - default=_default_cost_center + default=lambda self: self._default_cost_center(), ) - - @api.model - def move_line_get_item(self, line): - res = super(AccountInvoiceLine, self).move_line_get_item(line) - if line.cost_center_id: - res['cost_center_id'] = line.cost_center_id.id - return res diff --git a/account_cost_center/models/account_invoice_report.py b/account_cost_center/models/account_invoice_report.py index 599205901..4d161e7dc 100644 --- a/account_cost_center/models/account_invoice_report.py +++ b/account_cost_center/models/account_invoice_report.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2017 Onestein () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from openerp import fields, models +from odoo import fields, models class AccountInvoiceReport(models.Model): @@ -21,15 +21,12 @@ class AccountInvoiceReport(models.Model): def _select(self): return super(AccountInvoiceReport, self)._select() + \ - ", sub.cost_center_id as cost_center_id, " + \ - "sub.account_analytic_id as account_analytic_id" + ", sub.cost_center_id as cost_center_id" def _sub_select(self): return super(AccountInvoiceReport, self)._sub_select() + \ - ", ail.cost_center_id as cost_center_id, " + \ - "ail.account_analytic_id as account_analytic_id" + ", ail.cost_center_id as cost_center_id" def _group_by(self): return super(AccountInvoiceReport, self)._group_by() + \ - ", ail.cost_center_id, " + \ - "ail.account_analytic_id" + ", ail.cost_center_id" diff --git a/account_cost_center/models/account_move_line.py b/account_cost_center/models/account_move_line.py index cd4c08d58..a64a3c0d7 100644 --- a/account_cost_center/models/account_move_line.py +++ b/account_cost_center/models/account_move_line.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright 2015-2017 Onestein () -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +# Copyright 2015-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from openerp import fields, models +from odoo import fields, models class AccountMoveLine(models.Model): diff --git a/account_cost_center/readme/CONTRIBUTORS.rst b/account_cost_center/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..c10c90a20 --- /dev/null +++ b/account_cost_center/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Kevin Graveman +* Richard Dijkstra +* Andrea Stirpe +* Antonio Esposito diff --git a/account_cost_center/readme/DESCRIPTION.rst b/account_cost_center/readme/DESCRIPTION.rst new file mode 100644 index 000000000..d5a4029c8 --- /dev/null +++ b/account_cost_center/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module allows the user to link every invoice line to a cost center +providing an extra dimension for the analysis. diff --git a/account_cost_center/readme/USAGE.rst b/account_cost_center/readme/USAGE.rst new file mode 100644 index 000000000..76b48f772 --- /dev/null +++ b/account_cost_center/readme/USAGE.rst @@ -0,0 +1,28 @@ +This module is relevant when you are creating sales invoices and using analytic accounting. + +Start using cost centers by defining the cost centers. Be aware that Analytic Accounting +must be activated on the user for the following menu option. +Use the menu in the accounting module: + + **Configuration > Analytics accounting > Cost centers** + +.. figure:: static/description/account_costcenter_1.png + :alt: Cost centers can be configured + :align: center + +Once defined you can add a cost center to an invoice line. A default cost center for +the current invoice can be set in the other info tab. + +.. figure:: static/description/account_costcenter_2.png + :alt: Cost centers can be selected on invoice lines + :align: center + +This module adds the cost center concept to the reporting. + + **Accounting > Invoice Analysis** + +Here you can select or unselect the cost center within your analysis. + +.. figure:: static/description/account_costcenter_3.png + :alt: Cost centers can be selected on invoice lines + :align: center diff --git a/account_cost_center/security/account_cost_center_security.xml b/account_cost_center/security/account_cost_center_security.xml new file mode 100644 index 000000000..e4635af4f --- /dev/null +++ b/account_cost_center/security/account_cost_center_security.xml @@ -0,0 +1,13 @@ + + + + + + Cost center multi company rule + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + + diff --git a/account_cost_center/static/description/icon.png b/account_cost_center/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/account_cost_center/static/description/icon.png differ diff --git a/account_cost_center/static/description/icon.svg b/account_cost_center/static/description/icon.svg new file mode 100644 index 000000000..a7a26d093 --- /dev/null +++ b/account_cost_center/static/description/icon.svg @@ -0,0 +1,79 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/account_cost_center/static/description/index.html b/account_cost_center/static/description/index.html deleted file mode 100644 index dc0671b62..000000000 --- a/account_cost_center/static/description/index.html +++ /dev/null @@ -1,58 +0,0 @@ -
-
-

Cost center analysis

-

easy and effective.

-
-

- Odoo has many reporting functions. Lacking was the cost center concept which we added in this module. -

-

- Cost centers can be configured after you made the reporting design. -

-
- -
-
- Costcenter analysis -
-
- -
-
- - -
-
-

Input on invoice lines

-
-

- Cost centers can be selected on invoice lines. -

-
-
-
- Costcenter analysis -
-
- -
-
- - -
-
-

BI reporting

-
-

- Reporting is integrated with the invoice reporting. This reporting is also extended with the analytic accounting. - Cost centers and analytic account will help managing business costs. -

-
-
-
- Costcenter analysis -
-
- -
-
diff --git a/account_cost_center/tests/__init__.py b/account_cost_center/tests/__init__.py new file mode 100644 index 000000000..1b3d287d3 --- /dev/null +++ b/account_cost_center/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import test_cost_center diff --git a/account_cost_center/tests/test_cost_center.py b/account_cost_center/tests/test_cost_center.py new file mode 100644 index 000000000..05c8007e1 --- /dev/null +++ b/account_cost_center/tests/test_cost_center.py @@ -0,0 +1,76 @@ +# -*- coding: utf-8 -*- +# Copyright 2017-2018 Onestein () +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.tests import common + + +class TestAccountCostCenter(common.TransactionCase): + + def setUp(self): + super(TestAccountCostCenter, self).setUp() + + acc_rec = self.env.ref('account.data_account_type_receivable') + acc_exp = self.env.ref('account.data_account_type_expenses') + self.invoice_account = self.env['account.account'].search([ + ('user_type_id', '=', acc_rec.id) + ], limit=1).id + self.invoice_line_account = self.env['account.account'].search([ + ('user_type_id', '=', acc_exp.id)], + limit=1).id + + self.invoice1 = self.env['account.invoice'].create({ + 'partner_id': self.env.ref('base.res_partner_2').id, + 'account_id': self.invoice_account, + 'type': 'in_invoice', + }) + + self.line1 = self.env['account.invoice.line'].create({ + 'product_id': self.env.ref('product.product_product_2').id, + 'quantity': 1.0, + 'price_unit': 100.0, + 'invoice_id': self.invoice1.id, + 'name': 'product that cost 100', + 'account_id': self.invoice_line_account, + }) + + self.costcenter = self.env['account.cost.center'].create({ + 'name': 'Cost Center Test', + 'code': 'CC1', + 'company_id': self.env.user.company_id.id + }) + + self.invoice2 = self.env['account.invoice'].create({ + 'partner_id': self.env.ref('base.res_partner_2').id, + 'account_id': self.invoice_account, + 'type': 'in_invoice', + 'cost_center_id': self.costcenter.id, + }) + + self.line2 = self.env['account.invoice.line'].with_context( + cost_center_id=self.costcenter.id).create({ + 'product_id': self.env.ref('product.product_product_4').id, + 'quantity': 1.0, + 'price_unit': 130.0, + 'invoice_id': self.invoice2.id, + 'name': 'product that cost 130', + 'account_id': self.invoice_line_account, + }) + + def test_01_check_lines(self): + self.assertFalse( + self.line1.cost_center_id, + "Default cost center per line not set") + + self.assertTrue( + (self.line2.cost_center_id == self.costcenter), + "Default cost center per line set") + + def test_02_confirm_invoice(self): + self.invoice2.action_invoice_open() + for move in self.invoice2.move_id.line_ids: + cost_center = move.cost_center_id + if move.name == 'product that cost 130': + self.assertTrue(cost_center) + else: + self.assertFalse(cost_center) diff --git a/account_cost_center/views/account_cost_center.xml b/account_cost_center/views/account_cost_center.xml index 91419917b..88dd60c14 100644 --- a/account_cost_center/views/account_cost_center.xml +++ b/account_cost_center/views/account_cost_center.xml @@ -1,78 +1,78 @@ - - - + + - - - account.cost.center - -
- - -
-
+ + + account.cost.center + + + + +
+
+ + + + - - - - - - + + - - - - - - + + + +
+ + + - - account.cost.center - - - - - - - + + account.cost.center + + + + + + + + - - account.cost.center - - - - - - + + account.cost.center + + + + + + - - Cost Centers - ir.actions.act_window - account.cost.center - form - tree,form - - -

- Click to add a new event. -

-

- Cost centers provide an extra analytic dimension -

- - + + Cost Centers + ir.actions.act_window + account.cost.center + form + tree,form + + +

+ Click to add a new cost center. +

+

+ Cost centers provide an extra analytic dimension +

+ + - - + + - - + diff --git a/account_cost_center/views/account_invoice.xml b/account_cost_center/views/account_invoice.xml index 1ee1b7d32..cc6dd0ccf 100644 --- a/account_cost_center/views/account_invoice.xml +++ b/account_cost_center/views/account_invoice.xml @@ -1,38 +1,36 @@ - - + - - account.invoice - - - - - - - - - - cost_center_id - + + account.invoice + + + + - - - - account.invoice - - - - - - - - - - cost_center_id - + + + + + cost_center_id - + + - - + + account.invoice + + + + + + + + + + cost_center_id + + + + + diff --git a/account_cost_center/views/account_invoice_report.xml b/account_cost_center/views/account_invoice_report.xml index e525d4575..c6e7ccfda 100644 --- a/account_cost_center/views/account_invoice_report.xml +++ b/account_cost_center/views/account_invoice_report.xml @@ -1,17 +1,15 @@ - - + - - account.invoice.report - - - - - - - - + + account.invoice.report + + + + + + + + - - + diff --git a/account_cost_center/views/account_move.xml b/account_cost_center/views/account_move.xml index 81d2cdb6c..45a4860fd 100644 --- a/account_cost_center/views/account_move.xml +++ b/account_cost_center/views/account_move.xml @@ -1,19 +1,14 @@ - - + - - account.move - - - - - - - - - - + + account.move + + + + + + + - - + diff --git a/account_cost_center/views/account_move_line.xml b/account_cost_center/views/account_move_line.xml index f476c5b4a..61a03dc5a 100644 --- a/account_cost_center/views/account_move_line.xml +++ b/account_cost_center/views/account_move_line.xml @@ -1,27 +1,25 @@ - - + - - account.move.line - - - - - + + account.move.line + + + + - + + - - account.move.line - - 1 - - - - + + account.move.line + + 1 + + + - + + - - +