From 754f1da06307176f74c33c79ceecddf52183809e Mon Sep 17 00:00:00 2001 From: Cyril VINH-TUNG Date: Sun, 19 Mar 2023 09:01:12 -1000 Subject: [PATCH 1/5] Updated from template --- .copier-answers.yml | 7 ++----- README.md | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index f6097ada..f1f1d5d0 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -13,12 +13,9 @@ odoo_version: 14.0 org_name: Odoo Community Association (OCA) org_slug: OCA rebel_module_groups: [] -repo_description: 'TODO: add repo description.' -repo_name: account-budgeting +repo_description: You'll find modules that manage budgeting. +repo_name: Odoo Budgeting repo_slug: account-budgeting repo_website: https://github.com/OCA/account-budgeting travis_apt_packages: [] travis_apt_sources: [] -use_pyproject_toml: false -use_ruff: false - diff --git a/README.md b/README.md index c12a275e..ff1ebf11 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,9 @@ -# account-budgeting +# Odoo Budgeting -TODO: add repo description. +You'll find modules that manage budgeting. From b02241affc529b643dc1f7ba982ffb5bdcd09e60 Mon Sep 17 00:00:00 2001 From: Cyril VINH-TUNG Date: Mon, 31 Oct 2022 07:46:36 -1000 Subject: [PATCH 2/5] [ADD] account_budget_oca_analytic_tag --- account_budget_oca_analytic_tag/README.rst | 24 ++++++ account_budget_oca_analytic_tag/__init__.py | 3 + .../__manifest__.py | 20 +++++ .../i18n/account_budget_analytic_tag.pot | 49 ++++++++++++ account_budget_oca_analytic_tag/i18n/es.po | 51 +++++++++++++ .../models/__init__.py | 3 + .../models/account_budget.py | 71 ++++++++++++++++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 3 + .../test_account_budget_oca_analytic_tag.py | 63 ++++++++++++++++ .../views/account_budget_views.xml | 41 ++++++++++ .../addons/account_budget_oca_analytic_tag | 1 + .../account_budget_oca_analytic_tag/setup.py | 6 ++ 13 files changed, 335 insertions(+) create mode 100644 account_budget_oca_analytic_tag/README.rst create mode 100644 account_budget_oca_analytic_tag/__init__.py create mode 100644 account_budget_oca_analytic_tag/__manifest__.py create mode 100644 account_budget_oca_analytic_tag/i18n/account_budget_analytic_tag.pot create mode 100644 account_budget_oca_analytic_tag/i18n/es.po create mode 100644 account_budget_oca_analytic_tag/models/__init__.py create mode 100644 account_budget_oca_analytic_tag/models/account_budget.py create mode 100644 account_budget_oca_analytic_tag/static/description/icon.png create mode 100644 account_budget_oca_analytic_tag/tests/__init__.py create mode 100644 account_budget_oca_analytic_tag/tests/test_account_budget_oca_analytic_tag.py create mode 100644 account_budget_oca_analytic_tag/views/account_budget_views.xml create mode 120000 setup/account_budget_oca_analytic_tag/odoo/addons/account_budget_oca_analytic_tag create mode 100644 setup/account_budget_oca_analytic_tag/setup.py diff --git a/account_budget_oca_analytic_tag/README.rst b/account_budget_oca_analytic_tag/README.rst new file mode 100644 index 00000000..68a40518 --- /dev/null +++ b/account_budget_oca_analytic_tag/README.rst @@ -0,0 +1,24 @@ +.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 + +=============================== +OSI Account Budget Analytic Tag +=============================== + +This module allows you to select an analytic tag on the budget line and report the consumed budget using that tag. + +Usage +===== + +No special usage instructions + +Credits +======= + +* Maxime Chambreuil + +Contributors +------------ + +* Open Source Integrators diff --git a/account_budget_oca_analytic_tag/__init__.py b/account_budget_oca_analytic_tag/__init__.py new file mode 100644 index 00000000..7d768b54 --- /dev/null +++ b/account_budget_oca_analytic_tag/__init__.py @@ -0,0 +1,3 @@ +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). + +from . import models diff --git a/account_budget_oca_analytic_tag/__manifest__.py b/account_budget_oca_analytic_tag/__manifest__.py new file mode 100644 index 00000000..38c38a29 --- /dev/null +++ b/account_budget_oca_analytic_tag/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright (c) 2021 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "OSI Account Budget OCA Analytic Tag", + "version": "14.0.1.0.0", + "license": "AGPL-3", + "summary": "This module allows you to select an analytic tag on the budget" + " line and report the consumed budget using that tag.", + "author": "Open Source Integrators, Odoo Community Association (OCA)", + "maintainer": "Open Source Integrators", + "website": "https://github.com/OCA/account-budgeting", + "category": "Accounting", + "depends": ["account_budget_oca"], + "data": [ + "views/account_budget_views.xml", + ], + "installable": True, + "maintainers": ["max3903"], +} diff --git a/account_budget_oca_analytic_tag/i18n/account_budget_analytic_tag.pot b/account_budget_oca_analytic_tag/i18n/account_budget_analytic_tag.pot new file mode 100644 index 00000000..e1a526ba --- /dev/null +++ b/account_budget_oca_analytic_tag/i18n/account_budget_analytic_tag.pot @@ -0,0 +1,49 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_budget_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0+e-20211202\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-12-23 19:57+0000\n" +"PO-Revision-Date: 2021-12-23 19:57+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_budget_analytic_tag +#: model:ir.model.fields,field_description:account_budget_analytic_tag.field_crossovered_budget_lines__analytic_tag_id +msgid "Analytic Tag" +msgstr "" + +#. module: account_budget_analytic_tag +#: model:ir.model,name:account_budget_analytic_tag.model_crossovered_budget_lines +msgid "Budget Line" +msgstr "" + +#. module: account_budget_analytic_tag +#: model:ir.model.fields,field_description:account_budget_analytic_tag.field_crossovered_budget_lines__display_name +msgid "Display Name" +msgstr "" + +#. module: account_budget_analytic_tag +#: model:ir.model.fields,field_description:account_budget_analytic_tag.field_crossovered_budget_lines__id +msgid "ID" +msgstr "" + +#. module: account_budget_analytic_tag +#: model:ir.model.fields,field_description:account_budget_analytic_tag.field_crossovered_budget_lines____last_update +msgid "Last Modified on" +msgstr "" + +#. module: account_budget_analytic_tag +#: code:addons/account_budget_analytic_tag/models/account_budget.py:0 +#, python-format +msgid "" +"You have to enter at least a budgetary position or analytic account or " +"analytic tag on a budget line." +msgstr "" diff --git a/account_budget_oca_analytic_tag/i18n/es.po b/account_budget_oca_analytic_tag/i18n/es.po new file mode 100644 index 00000000..8d1c03a0 --- /dev/null +++ b/account_budget_oca_analytic_tag/i18n/es.po @@ -0,0 +1,51 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_budget_analytic_tag +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0+e-20211202\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-12-23 19:57+0000\n" +"PO-Revision-Date: 2021-12-23 19:57+0000\n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_budget_analytic_tag +#: model:ir.model.fields,field_description:account_budget_analytic_tag.field_crossovered_budget_lines__analytic_tag_id +msgid "Analytic Tag" +msgstr "Etiqueta analítica" + +#. module: account_budget_analytic_tag +#: model:ir.model,name:account_budget_analytic_tag.model_crossovered_budget_lines +msgid "Budget Line" +msgstr "Línea de presupuesto" + +#. module: account_budget_analytic_tag +#: model:ir.model.fields,field_description:account_budget_analytic_tag.field_crossovered_budget_lines__display_name +msgid "Display Name" +msgstr "Nombre" + +#. module: account_budget_analytic_tag +#: model:ir.model.fields,field_description:account_budget_analytic_tag.field_crossovered_budget_lines__id +msgid "ID" +msgstr "" + +#. module: account_budget_analytic_tag +#: model:ir.model.fields,field_description:account_budget_analytic_tag.field_crossovered_budget_lines____last_update +msgid "Last Modified on" +msgstr "Ultima modificación el" + +#. module: account_budget_analytic_tag +#: code:addons/account_budget_analytic_tag/models/account_budget.py:0 +#, python-format +msgid "" +"You have to enter at least a budgetary position or analytic account or " +"analytic tag on a budget line." +msgstr "" +"Deben entrar por lo menos una posicion presupuestarial, cuenta analítica o etiqueta " +"analítica en una línea de presupuesto." diff --git a/account_budget_oca_analytic_tag/models/__init__.py b/account_budget_oca_analytic_tag/models/__init__.py new file mode 100644 index 00000000..4eb3bdd9 --- /dev/null +++ b/account_budget_oca_analytic_tag/models/__init__.py @@ -0,0 +1,3 @@ +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). + +from . import account_budget diff --git a/account_budget_oca_analytic_tag/models/account_budget.py b/account_budget_oca_analytic_tag/models/account_budget.py new file mode 100644 index 00000000..f50e8a0b --- /dev/null +++ b/account_budget_oca_analytic_tag/models/account_budget.py @@ -0,0 +1,71 @@ +# Copyright (c) 2021 Open Source Integrators +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError + + +class CrossoveredBudgetLines(models.Model): + _inherit = "crossovered.budget.lines" + + analytic_tag_id = fields.Many2one("account.analytic.tag", string="Analytic Tag") + + def _compute_practical_amount(self): + """Overwrite this method for to count practical_amount based on + analytic_tag_id on move line.""" + for line in self: + acc_ids = line.general_budget_id.account_ids.ids + date_to = line.date_to + date_from = line.date_from + if line.analytic_account_id.id: + self.env.cr.execute( + """ + SELECT SUM(amount) + FROM account_analytic_line + WHERE account_id=%s + AND (date between %s + AND %s) + AND general_account_id=ANY(%s)""", + (line.analytic_account_id.id, date_from, date_to, acc_ids), + ) + result = self.env.cr.fetchone()[0] or 0.0 + + else: + self.env.cr.execute( + """ + SELECT SUM(credit) - SUM(debit) + FROM account_move_line aml + LEFT JOIN account_move am ON aml.move_id = am.id + LEFT JOIN + account_analytic_tag_account_move_line_rel aat + ON aat.account_move_line_id = aml.id + WHERE state=%s + AND account_id in %s + AND (aml.date between %s + AND %s) + AND aat.account_analytic_tag_id=%s""", + ( + "posted", + tuple(line.general_budget_id.account_ids.ids), + date_from, + date_to, + line.analytic_tag_id.id or 0.0, + ), + ) + result = self.env.cr.fetchone()[0] + line.practical_amount = result + + @api.constrains("general_budget_id", "analytic_account_id", "analytic_tag_id") + def _must_have_analytical_or_budgetary_or_both(self): + for record in self: + if ( + not record.analytic_account_id + and not record.general_budget_id + and not record.analytic_tag_id + ): + raise ValidationError( + _( + "You have to enter at least a budgetary position or analytic account" + " or analytic tag on a budget line." + ) + ) diff --git a/account_budget_oca_analytic_tag/static/description/icon.png b/account_budget_oca_analytic_tag/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_budget_oca_analytic_tag/tests/__init__.py b/account_budget_oca_analytic_tag/tests/__init__.py new file mode 100644 index 00000000..847859fb --- /dev/null +++ b/account_budget_oca_analytic_tag/tests/__init__.py @@ -0,0 +1,3 @@ +# Copyright (C) 2022 Open Source Integrators (https://www.opensourceintegrators.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import test_account_budget_oca_analytic_tag diff --git a/account_budget_oca_analytic_tag/tests/test_account_budget_oca_analytic_tag.py b/account_budget_oca_analytic_tag/tests/test_account_budget_oca_analytic_tag.py new file mode 100644 index 00000000..1d459a28 --- /dev/null +++ b/account_budget_oca_analytic_tag/tests/test_account_budget_oca_analytic_tag.py @@ -0,0 +1,63 @@ +# Copyright (C) 2022 Open Source Integrators (https://www.opensourceintegrators.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests import common + + +class TestBudgetAnalyticTag(common.TransactionCase): + def setUp(self): + super(TestBudgetAnalyticTag, self).setUp() + + self.budget_position_obj = self.env["account.budget.post"] + self.exp_account_type = self.env.ref("account.data_account_type_expenses") + self.company_id = self.env.ref("base.main_company") + self.analytic_account_id = self.env.ref("analytic.analytic_agrolait") + self.user_id = self.env.ref("base.user_admin") + self.partner_id = self.env.ref("base.res_partner_2") + self.product_id = self.env.ref("product.product_product_8") + self.budget_position_id = self.test_create_budget_position() + + def test_create_budget_position(self): + account_ids = ( + self.env["account.account"] + .search( + [ + ("company_id", "=", self.company_id.id), + ("user_type_id", "=", self.exp_account_type.id), + ] + ) + .ids + ) + return self.budget_position_obj.create( + { + "name": "Budget Position", + "company_id": self.company_id.id, + "account_ids": [(6, 0, account_ids)], + } + ) + + def test_budget_creation(self): + budget_id = self.env["crossovered.budget"].create( + { + "name": "Budget 2022", + "creating_user_id": self.user_id.id, + "company_id": self.company_id.id, + "date_from": "2022-01-01", + "date_to": "2022-06-30", + "crossovered_budget_line_ids": [ + ( + 0, + 0, + { + "general_budget_id": self.budget_position_id.id, + "analytic_account_id": self.analytic_account_id.id, + "date_from": "2022-01-01", + "date_to": "2022-06-30", + "planned_amount": 10000.00, + }, + ) + ], + } + ) + budget_id.action_budget_confirm() + budget_id.action_budget_validate() diff --git a/account_budget_oca_analytic_tag/views/account_budget_views.xml b/account_budget_oca_analytic_tag/views/account_budget_views.xml new file mode 100644 index 00000000..1530789e --- /dev/null +++ b/account_budget_oca_analytic_tag/views/account_budget_views.xml @@ -0,0 +1,41 @@ + + + + crossovered.budget.view.form.inherit.analytic_tag + crossovered.budget + + + + 0 + + + 0 + + + + + + + + + + + diff --git a/setup/account_budget_oca_analytic_tag/odoo/addons/account_budget_oca_analytic_tag b/setup/account_budget_oca_analytic_tag/odoo/addons/account_budget_oca_analytic_tag new file mode 120000 index 00000000..014f2182 --- /dev/null +++ b/setup/account_budget_oca_analytic_tag/odoo/addons/account_budget_oca_analytic_tag @@ -0,0 +1 @@ +../../../../account_budget_oca_analytic_tag \ No newline at end of file diff --git a/setup/account_budget_oca_analytic_tag/setup.py b/setup/account_budget_oca_analytic_tag/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_budget_oca_analytic_tag/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 065121c42f17707cb26337d18af7b164ab8b6367 Mon Sep 17 00:00:00 2001 From: Cyril VINH-TUNG Date: Thu, 8 Jun 2023 14:04:08 -1000 Subject: [PATCH 3/5] [FIX] Practical amount should not be computed if Budgetary position has no account --- account_budget_oca_analytic_tag/models/account_budget.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/account_budget_oca_analytic_tag/models/account_budget.py b/account_budget_oca_analytic_tag/models/account_budget.py index f50e8a0b..d5d85397 100644 --- a/account_budget_oca_analytic_tag/models/account_budget.py +++ b/account_budget_oca_analytic_tag/models/account_budget.py @@ -30,7 +30,7 @@ def _compute_practical_amount(self): ) result = self.env.cr.fetchone()[0] or 0.0 - else: + elif line.general_budget_id.account_ids: self.env.cr.execute( """ SELECT SUM(credit) - SUM(debit) @@ -53,6 +53,8 @@ def _compute_practical_amount(self): ), ) result = self.env.cr.fetchone()[0] + else: + result = 0.0 line.practical_amount = result @api.constrains("general_budget_id", "analytic_account_id", "analytic_tag_id") From 4c3ce3a1696f88985585c091ce4cb59923fc59ea Mon Sep 17 00:00:00 2001 From: Cyril VINH-TUNG Date: Mon, 31 Oct 2022 08:44:17 -1000 Subject: [PATCH 4/5] [ADD] purchase_budget_oca_validation --- purchase_budget_oca_validation/README.rst | 71 ++++++++++++ purchase_budget_oca_validation/__init__.py | 3 + .../__manifest__.py | 20 ++++ .../models/__init__.py | 6 + .../models/crossovered_budget.py | 11 ++ .../models/crossovered_budget_lines.py | 92 ++++++++++++++++ .../models/purchase_order.py | 74 +++++++++++++ .../models/purchase_order_line.py | 30 +++++ .../static/description/icon.png | Bin 0 -> 9455 bytes .../tests/__init__.py | 3 + .../tests/test_purchase_budget_validation.py | 104 ++++++++++++++++++ .../views/crossovered_budget_lines_view.xml | 31 ++++++ .../views/purchase_order_view.xml | 12 ++ .../addons/purchase_budget_oca_validation | 1 + setup/purchase_budget_oca_validation/setup.py | 6 + 15 files changed, 464 insertions(+) create mode 100644 purchase_budget_oca_validation/README.rst create mode 100644 purchase_budget_oca_validation/__init__.py create mode 100644 purchase_budget_oca_validation/__manifest__.py create mode 100644 purchase_budget_oca_validation/models/__init__.py create mode 100644 purchase_budget_oca_validation/models/crossovered_budget.py create mode 100644 purchase_budget_oca_validation/models/crossovered_budget_lines.py create mode 100644 purchase_budget_oca_validation/models/purchase_order.py create mode 100644 purchase_budget_oca_validation/models/purchase_order_line.py create mode 100644 purchase_budget_oca_validation/static/description/icon.png create mode 100644 purchase_budget_oca_validation/tests/__init__.py create mode 100644 purchase_budget_oca_validation/tests/test_purchase_budget_validation.py create mode 100644 purchase_budget_oca_validation/views/crossovered_budget_lines_view.xml create mode 100644 purchase_budget_oca_validation/views/purchase_order_view.xml create mode 120000 setup/purchase_budget_oca_validation/odoo/addons/purchase_budget_oca_validation create mode 100644 setup/purchase_budget_oca_validation/setup.py diff --git a/purchase_budget_oca_validation/README.rst b/purchase_budget_oca_validation/README.rst new file mode 100644 index 00000000..3b8e2251 --- /dev/null +++ b/purchase_budget_oca_validation/README.rst @@ -0,0 +1,71 @@ +========================== +Purchase Budget Validation +========================== + +.. |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-LGPL--3-blue.png + :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html + :alt: License: LGPL-3 + +|badge1| |badge2| + +This module checks the purchase order lines amount against their related budgets and +prevents you from going over budget. + +**Table of contents** + +.. contents:: + :local: + +Configuration +============= + +* Create a budget with either a budgetary position, an analytic account or analytic tag +* Confirm it + +Usage +===== + +* Create a purchase order and select a product, analytic account or tag that matches one of your budget lines. +* Check for message in the chatter if you are over a budget. + +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 +`feedback `_. + +Credits +======= + +Authors +~~~~~~~ + +* Open Source Integrators +* Serpent Consulting Services + +Contributors +~~~~~~~~~~~~ + +* Maxime Chambreuil +* Hardik Suthar + +Other credits +~~~~~~~~~~~~~ + +The development of this module has been financially supported by: + +* Casai + +Maintainers +~~~~~~~~~~~ + +.. |maintainer-max3903| image:: https://github.com/max3903.png?size=40px + :target: https://github.com/max3903 + :alt: max3903 + +|maintainer-max3903| diff --git a/purchase_budget_oca_validation/__init__.py b/purchase_budget_oca_validation/__init__.py new file mode 100644 index 00000000..253a08ea --- /dev/null +++ b/purchase_budget_oca_validation/__init__.py @@ -0,0 +1,3 @@ +# Copyright (c) 2022 Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +from . import models diff --git a/purchase_budget_oca_validation/__manifest__.py b/purchase_budget_oca_validation/__manifest__.py new file mode 100644 index 00000000..5559a15f --- /dev/null +++ b/purchase_budget_oca_validation/__manifest__.py @@ -0,0 +1,20 @@ +# Copyright (c) 2022 Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +{ + "name": "Purchase Budget OCA Validation", + "version": "14.0.1.0.0", + "author": "Open Source Integrators, Odoo Community Association (OCA)", + "summary": "Check purchase orders against budgets", + "license": "AGPL-3", + "category": "Purchase", + "maintainer": "Open Source Integrators", + "website": "https://github.com/OCA/account-budgeting", + "depends": ["purchase", "account_budget_oca_analytic_tag"], + "installable": True, + "maintainers": ["max3903"], + "development_status": "Beta", + "data": [ + "views/crossovered_budget_lines_view.xml", + "views/purchase_order_view.xml", + ], +} diff --git a/purchase_budget_oca_validation/models/__init__.py b/purchase_budget_oca_validation/models/__init__.py new file mode 100644 index 00000000..a60f7980 --- /dev/null +++ b/purchase_budget_oca_validation/models/__init__.py @@ -0,0 +1,6 @@ +# Copyright (c) 2022 Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +from . import crossovered_budget +from . import crossovered_budget_lines +from . import purchase_order +from . import purchase_order_line diff --git a/purchase_budget_oca_validation/models/crossovered_budget.py b/purchase_budget_oca_validation/models/crossovered_budget.py new file mode 100644 index 00000000..19f72c13 --- /dev/null +++ b/purchase_budget_oca_validation/models/crossovered_budget.py @@ -0,0 +1,11 @@ +# Copyright (c) 2022 Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +from odoo import fields, models + + +class CrossoveredBudget(models.Model): + _inherit = "crossovered.budget" + + amount_include_tax = fields.Boolean( + "Include Taxes in Amount", default=False, copy=False + ) diff --git a/purchase_budget_oca_validation/models/crossovered_budget_lines.py b/purchase_budget_oca_validation/models/crossovered_budget_lines.py new file mode 100644 index 00000000..8d92f23e --- /dev/null +++ b/purchase_budget_oca_validation/models/crossovered_budget_lines.py @@ -0,0 +1,92 @@ +# Copyright (c) 2022 Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +from odoo import fields, models + + +class CrossoveredBudgetLines(models.Model): + _inherit = "crossovered.budget.lines" + + committed_amount = fields.Float( + compute="_compute_committ_uncommitt_amount", string="Committed Amount" + ) + uncommitted_amount = fields.Float( + compute="_compute_committ_uncommitt_amount", string="Uncommitted Amount" + ) + over_budget = fields.Boolean(compute="_compute_over_budget", string="Over Budget") + + def _compute_committ_uncommitt_amount(self): + purchase_line_obj = self.env["purchase.order.line"] + for budget_line in self: + commit_domain = [ + ("date_order", ">=", budget_line.date_from), + ("date_order", "<=", budget_line.date_to), + ("order_id.state", "in", ("purchase", "done")), + "|", + ("account_analytic_id", "=", budget_line.analytic_account_id.id), + ("analytic_tag_ids", "in", budget_line.analytic_tag_id.ids), + "|", + ( + "product_id.property_account_expense_id", + "in", + budget_line.general_budget_id.account_ids.ids, + ), + ( + "product_id.categ_id.property_account_expense_categ_id", + "in", + budget_line.general_budget_id.account_ids.ids, + ), + ] + po_lines_commimt = purchase_line_obj.search(commit_domain) + if budget_line.crossovered_budget_id.amount_include_tax: + budget_line.committed_amount = -sum( + [ + line.price_unit * (line.product_qty - line.qty_invoiced) + + line.price_tax + for line in po_lines_commimt + ] + ) + else: + budget_line.committed_amount = -sum( + [ + line.price_unit * (line.product_qty - line.qty_invoiced) + for line in po_lines_commimt + ] + ) + uncommit_domain = [ + ("date_order", ">=", budget_line.date_from), + ("date_order", "<=", budget_line.date_to), + ("order_id.state", "not in", ("purchase", "done", "cancel")), + "|", + ("account_analytic_id", "=", budget_line.analytic_account_id.id), + ("analytic_tag_ids", "in", budget_line.analytic_tag_id.ids), + "|", + ( + "product_id.property_account_expense_id", + "in", + budget_line.general_budget_id.account_ids.ids, + ), + ( + "product_id.categ_id.property_account_expense_categ_id", + "in", + budget_line.general_budget_id.account_ids.ids, + ), + ] + po_lines_uncommit = purchase_line_obj.search(uncommit_domain) + if budget_line.crossovered_budget_id.amount_include_tax: + budget_line.uncommitted_amount = -sum( + [line.price_subtotal + line.price_tax for line in po_lines_uncommit] + ) + else: + budget_line.uncommitted_amount = -sum( + [line.price_subtotal for line in po_lines_uncommit] + ) + + def _compute_over_budget(self): + for rec in self: + rec.over_budget = False + if ( + abs(rec.practical_amount) + + abs(rec.committed_amount) + + abs(rec.uncommitted_amount) + ) > abs(rec.planned_amount): + rec.over_budget = True diff --git a/purchase_budget_oca_validation/models/purchase_order.py b/purchase_budget_oca_validation/models/purchase_order.py new file mode 100644 index 00000000..858727be --- /dev/null +++ b/purchase_budget_oca_validation/models/purchase_order.py @@ -0,0 +1,74 @@ +# Copyright (c) 2022 Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). + +from odoo import _, api, fields, models +from odoo.exceptions import ValidationError + + +class PurchaseOrder(models.Model): + _inherit = "purchase.order" + + over_budget = fields.Boolean( + compute="_compute_over_budget_po", string="Over Budget" + ) + + def _compute_over_budget_po(self): + for rec in self: + rec.over_budget = rec.check_budget(notify=False) + + def check_budget(self, notify=False): + message = "" + users = self.env["res.users"] + over_budget = False + for po_line in self.order_line: + budget_lines = po_line._get_budget_lines() + for b_line in budget_lines: + if b_line.over_budget: + users += b_line.crossovered_budget_id.creating_user_id + message += _( + "This order is over budget %s / %s (%s):" + "
%s + %s + %s = %s > %s.
" + % ( + b_line.crossovered_budget_id.name, + b_line.general_budget_id.name, + b_line.crossovered_budget_id.creating_user_id.name, + abs(b_line.uncommitted_amount), + abs(b_line.committed_amount), + abs(b_line.practical_amount), + abs(b_line.practical_amount) + + abs(b_line.committed_amount) + + abs(b_line.uncommitted_amount), + abs(b_line.planned_amount), + ) + ) + if message: + over_budget = True + if notify: + self.message_subscribe(partner_ids=users.partner_id.ids) + self.message_post(body=message) + return over_budget + + def button_confirm(self): + for rec in self: + if rec.over_budget: + raise ValidationError( + _( + "You cannot confirm the purchase order " + "as one budget would go over the planned amount. " + "Please check the chatter for more details." + ) + ) + else: + super(PurchaseOrder, rec).button_confirm() + + @api.model + def create(self, vals): + res = super().create(vals) + res.check_budget(notify=True) + return res + + def write(self, vals): + res = super().write(vals) + for po in self: + po.check_budget(notify=True) + return res diff --git a/purchase_budget_oca_validation/models/purchase_order_line.py b/purchase_budget_oca_validation/models/purchase_order_line.py new file mode 100644 index 00000000..e4f7d172 --- /dev/null +++ b/purchase_budget_oca_validation/models/purchase_order_line.py @@ -0,0 +1,30 @@ +# Copyright (c) 2022 Open Source Integrators +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). +from odoo import models + + +class PurchaseOrderLine(models.Model): + _inherit = "purchase.order.line" + + def _get_budget_lines(self): + return self.env["crossovered.budget.lines"].search( + [ + ("date_from", "<=", self.date_order), + ("date_to", ">=", self.date_order), + ("crossovered_budget_id.state", "=", "validate"), + "|", + ("analytic_account_id", "=", self.account_analytic_id.id), + ("analytic_tag_id", "in", self.analytic_tag_ids.ids), + "|", + ( + "general_budget_id.account_ids", + "in", + self.product_id.property_account_expense_id.ids, + ), + ( + "general_budget_id.account_ids", + "in", + self.product_id.categ_id.property_account_expense_categ_id.ids, + ), + ] + ) diff --git a/purchase_budget_oca_validation/static/description/icon.png b/purchase_budget_oca_validation/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/purchase_budget_oca_validation/tests/__init__.py b/purchase_budget_oca_validation/tests/__init__.py new file mode 100644 index 00000000..b4c186c8 --- /dev/null +++ b/purchase_budget_oca_validation/tests/__init__.py @@ -0,0 +1,3 @@ +# Copyright (C) 2022 Open Source Integrators (https://www.opensourceintegrators.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). +from . import test_purchase_budget_validation diff --git a/purchase_budget_oca_validation/tests/test_purchase_budget_validation.py b/purchase_budget_oca_validation/tests/test_purchase_budget_validation.py new file mode 100644 index 00000000..99230422 --- /dev/null +++ b/purchase_budget_oca_validation/tests/test_purchase_budget_validation.py @@ -0,0 +1,104 @@ +# Copyright (C) 2022 Open Source Integrators (https://www.opensourceintegrators.com) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.exceptions import ValidationError +from odoo.tests import common + + +class TestBudgetValidation(common.TransactionCase): + def setUp(self): + super(TestBudgetValidation, self).setUp() + + self.budget_position_obj = self.env["account.budget.post"] + self.exp_account_type = self.env.ref("account.data_account_type_expenses") + self.company_id = self.env.ref("base.main_company") + self.analytic_account_id = self.env.ref("analytic.analytic_agrolait") + self.user_id = self.env.ref("base.user_admin") + self.partner_id = self.env.ref("base.res_partner_2") + self.product_id = self.env.ref("product.product_product_8") + self.budget_position_id = self.test_create_budget_position() + + def test_create_budget_position(self): + account_ids = ( + self.env["account.account"] + .search( + [ + ("company_id", "=", self.company_id.id), + ("user_type_id", "=", self.exp_account_type.id), + ] + ) + .ids + ) + return self.budget_position_obj.create( + { + "name": "Budget Position", + "company_id": self.company_id.id, + "account_ids": [(6, 0, account_ids)], + } + ) + + def test_budget_creation(self): + budget_id = self.env["crossovered.budget"].create( + { + "name": "Budget 2022", + "creating_user_id": self.user_id.id, + "company_id": self.company_id.id, + "date_from": "2022-01-01", + "date_to": "2022-06-30", + "amount_include_tax": True, + "crossovered_budget_line_ids": [ + ( + 0, + 0, + { + "general_budget_id": self.budget_position_id.id, + "analytic_account_id": self.analytic_account_id.id, + "date_from": "2022-01-01", + "date_to": "2022-06-30", + "planned_amount": 10000.00, + }, + ) + ], + } + ) + budget_id.action_budget_confirm() + budget_id.action_budget_validate() + + def test_purchase_order_budget(self): + po_id = self.env["purchase.order"].create( + { + "partner_id": self.partner_id.id, + "order_line": [ + ( + 0, + 0, + { + "product_id": self.product_id.id, + "account_analytic_id": self.analytic_account_id.id, + "product_qty": 5, + "price_unit": 1000, + }, + ) + ], + } + ) + self.assertRaises(ValidationError, po_id.button_confirm()) + po_id_new = po_id.copy() + po_id_new.order_line.unlink() + po_id_new.write( + { + "order_line": [ + ( + 0, + 0, + { + "product_id": self.product_id.id, + "account_analytic_id": self.analytic_account_id.id, + "product_qty": 5, + "price_unit": 1500, + }, + ) + ] + } + ) + self.assertRaises(ValidationError, po_id_new.button_confirm()) diff --git a/purchase_budget_oca_validation/views/crossovered_budget_lines_view.xml b/purchase_budget_oca_validation/views/crossovered_budget_lines_view.xml new file mode 100644 index 00000000..70f9c71b --- /dev/null +++ b/purchase_budget_oca_validation/views/crossovered_budget_lines_view.xml @@ -0,0 +1,31 @@ + + + account.budget.lines.form.inherit + crossovered.budget + + + + + + + + + + + + + + + + + + diff --git a/purchase_budget_oca_validation/views/purchase_order_view.xml b/purchase_budget_oca_validation/views/purchase_order_view.xml new file mode 100644 index 00000000..0966d362 --- /dev/null +++ b/purchase_budget_oca_validation/views/purchase_order_view.xml @@ -0,0 +1,12 @@ + + + purchase.order.form.inherit.budget + purchase.order + + + + + + + + diff --git a/setup/purchase_budget_oca_validation/odoo/addons/purchase_budget_oca_validation b/setup/purchase_budget_oca_validation/odoo/addons/purchase_budget_oca_validation new file mode 120000 index 00000000..4b5be9dd --- /dev/null +++ b/setup/purchase_budget_oca_validation/odoo/addons/purchase_budget_oca_validation @@ -0,0 +1 @@ +../../../../purchase_budget_oca_validation \ No newline at end of file diff --git a/setup/purchase_budget_oca_validation/setup.py b/setup/purchase_budget_oca_validation/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/purchase_budget_oca_validation/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 459a2edd86e9e544498217588cfd25cbfbf7114c Mon Sep 17 00:00:00 2001 From: Cyril VINH-TUNG Date: Thu, 17 Nov 2022 10:44:46 -1000 Subject: [PATCH 5/5] [IMP] add currency support for purchase_budget_oca_validation --- .../models/crossovered_budget_lines.py | 56 +++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/purchase_budget_oca_validation/models/crossovered_budget_lines.py b/purchase_budget_oca_validation/models/crossovered_budget_lines.py index 8d92f23e..0ef35d17 100644 --- a/purchase_budget_oca_validation/models/crossovered_budget_lines.py +++ b/purchase_budget_oca_validation/models/crossovered_budget_lines.py @@ -16,6 +16,7 @@ class CrossoveredBudgetLines(models.Model): def _compute_committ_uncommitt_amount(self): purchase_line_obj = self.env["purchase.order.line"] + company_currency = self.company_id.currency_id for budget_line in self: commit_domain = [ ("date_order", ">=", budget_line.date_from), @@ -40,15 +41,35 @@ def _compute_committ_uncommitt_amount(self): if budget_line.crossovered_budget_id.amount_include_tax: budget_line.committed_amount = -sum( [ - line.price_unit * (line.product_qty - line.qty_invoiced) - + line.price_tax + line.currency_id._convert( + line.price_unit, + company_currency, + self.company_id, + line.date_order, + round=False, + ) + * (line.product_qty - line.qty_invoiced) + + line.currency_id._convert( + line.price_tax, + company_currency, + self.company_id, + line.date_order, + round=False, + ) for line in po_lines_commimt ] ) else: budget_line.committed_amount = -sum( [ - line.price_unit * (line.product_qty - line.qty_invoiced) + line.currency_id._convert( + line.price_unit, + company_currency, + self.company_id, + line.date_order, + round=False, + ) + * (line.product_qty - line.qty_invoiced) for line in po_lines_commimt ] ) @@ -74,11 +95,36 @@ def _compute_committ_uncommitt_amount(self): po_lines_uncommit = purchase_line_obj.search(uncommit_domain) if budget_line.crossovered_budget_id.amount_include_tax: budget_line.uncommitted_amount = -sum( - [line.price_subtotal + line.price_tax for line in po_lines_uncommit] + [ + line.currency_id._convert( + line.price_subtotal, + company_currency, + self.company_id, + line.date_order, + round=False, + ) + + line.currency_id._convert( + line.price_tax, + company_currency, + self.company_id, + line.date_order, + round=False, + ) + for line in po_lines_uncommit + ] ) else: budget_line.uncommitted_amount = -sum( - [line.price_subtotal for line in po_lines_uncommit] + [ + line.currency_id._convert( + line.price_subtotal, + company_currency, + self.company_id, + line.date_order, + round=False, + ) + for line in po_lines_uncommit + ] ) def _compute_over_budget(self):