From ad3b41dbbb25925a9e2b8801178d3a806ac66065 Mon Sep 17 00:00:00 2001 From: Andrea Date: Fri, 15 Jun 2018 13:59:46 +0200 Subject: [PATCH] [10.0][MIG] Porting account_cost_center to V10 --- account_cost_center/README.rst | 89 +++++++---- account_cost_center/__init__.py | 3 +- .../{__openerp__.py => __manifest__.py} | 11 +- account_cost_center/models/__init__.py | 3 +- .../models/account_cost_center.py | 9 +- account_cost_center/models/account_invoice.py | 22 ++- .../models/account_invoice_line.py | 15 +- .../models/account_invoice_report.py | 15 +- .../models/account_move_line.py | 6 +- account_cost_center/readme/CONTRIBUTORS.rst | 4 + account_cost_center/readme/DESCRIPTION.rst | 2 + account_cost_center/readme/USAGE.rst | 28 ++++ .../security/account_cost_center_security.xml | 13 ++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/icon.svg | 79 ++++++++++ .../static/description/index.html | 58 -------- account_cost_center/tests/__init__.py | 4 + account_cost_center/tests/test_cost_center.py | 76 ++++++++++ .../views/account_cost_center.xml | 140 +++++++++--------- account_cost_center/views/account_invoice.xml | 64 ++++---- .../views/account_invoice_report.xml | 26 ++-- account_cost_center/views/account_move.xml | 27 ++-- .../views/account_move_line.xml | 40 +++-- 23 files changed, 453 insertions(+), 281 deletions(-) rename account_cost_center/{__openerp__.py => __manifest__.py} (61%) create mode 100644 account_cost_center/readme/CONTRIBUTORS.rst create mode 100644 account_cost_center/readme/DESCRIPTION.rst create mode 100644 account_cost_center/readme/USAGE.rst create mode 100644 account_cost_center/security/account_cost_center_security.xml create mode 100644 account_cost_center/static/description/icon.png create mode 100644 account_cost_center/static/description/icon.svg delete mode 100644 account_cost_center/static/description/index.html create mode 100644 account_cost_center/tests/__init__.py create mode 100644 account_cost_center/tests/test_cost_center.py 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 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 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 + + + - + + - - +