Maintainers
+Current maintainers:
+
This module is part of the ecosoft-odoo/budgeting project on GitHub.
+You are welcome to contribute.
+
+
+
+
diff --git a/budget_control_expense/tests/__init__.py b/budget_control_expense/tests/__init__.py
new file mode 100644
index 00000000..f4f62346
--- /dev/null
+++ b/budget_control_expense/tests/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_budget_expense
diff --git a/budget_control_expense/tests/test_budget_expense.py b/budget_control_expense/tests/test_budget_expense.py
new file mode 100644
index 00000000..2752d9cc
--- /dev/null
+++ b/budget_control_expense/tests/test_budget_expense.py
@@ -0,0 +1,251 @@
+# Copyright 2020 Ecosoft Co., Ltd. (http://ecosoft.co.th)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from freezegun import freeze_time
+
+from odoo import Command
+from odoo.exceptions import UserError
+from odoo.tests import tagged
+from odoo.tests.common import Form
+
+from odoo.addons.budget_control.tests.common import BudgetControlCommon
+
+
+@tagged("post_install", "-at_install")
+class TestBudgetControlExpense(BudgetControlCommon):
+ @classmethod
+ @freeze_time("2001-02-01")
+ def setUpClass(cls):
+ super().setUpClass()
+ # Create sample ready to use Budget Control
+ cls.budget_control = cls.BudgetControl.create(
+ {
+ "name": "CostCenter1/%s" % cls.year,
+ "template_id": cls.budget_period.template_id.id,
+ "budget_period_id": cls.budget_period.id,
+ "analytic_account_id": cls.costcenter1.id,
+ "plan_date_range_type_id": cls.date_range_type.id,
+ "template_line_ids": [
+ cls.template_line1.id,
+ cls.template_line2.id,
+ cls.template_line3.id,
+ ],
+ }
+ )
+ # Test item created for 3 kpi x 4 quarters = 12 budget items
+ cls.budget_control.prepare_budget_control_matrix()
+ assert len(cls.budget_control.line_ids) == 12
+ # Assign budget.control amount: KPI1 = 100, KPI2=800, Total=300
+ cls.budget_control.line_ids.filtered(lambda x: x.kpi_id == cls.kpi1)[:1].write(
+ {"amount": 100}
+ )
+ cls.budget_control.line_ids.filtered(lambda x: x.kpi_id == cls.kpi2)[:1].write(
+ {"amount": 200}
+ )
+ # cls.budget_control.flush_model() # Need to flush data into table, so it can be sql
+ # cls.budget_control.allocated_amount = 300
+ # cls.budget_control.action_done()
+
+ @freeze_time("2001-02-01")
+ def _create_expense_sheet(self, ex_lines):
+ Expense = self.env["hr.expense"]
+ view_id = "hr_expense.hr_expense_view_form"
+ expense_ids = []
+ user = self.env.ref("base.user_admin")
+ for ex_line in ex_lines:
+ with Form(Expense, view=view_id) as ex:
+ ex.employee_id = user.employee_id
+ ex.product_id = ex_line["product_id"]
+ ex.total_amount = ex_line["price_unit"] * ex_line["product_qty"]
+ ex.analytic_distribution = ex_line["analytic_distribution"]
+ expense = ex.save()
+ expense_ids.append(expense.id)
+ expense_sheet = self.env["hr.expense.sheet"].create(
+ {
+ "name": "Test Expense",
+ "employee_id": user.employee_id.id,
+ "expense_line_ids": [Command.set(expense_ids)],
+ }
+ )
+ return expense_sheet
+
+ @freeze_time("2001-02-01")
+ def test_01_budget_expense(self):
+ """
+ On Expense Sheet
+ (1) Test case, no budget check -> OK
+ (2) Check Budget with analytic_kpi -> Error amount exceed on kpi1
+ (3) Check Budget with analytic -> OK
+ (2) Check Budget with analytic -> Error amount exceed
+ """
+ # Allocate and Done
+ self.budget_control.allocated_amount = 300
+ self.budget_control.action_done()
+ # KPI1 = 100, KPI2 = 200, Total = 300
+ self.assertEqual(300, self.budget_control.amount_budget)
+ # Prepare Expense Sheet
+ analytic_distribution = {str(self.costcenter1.id): 100}
+ expense = self._create_expense_sheet(
+ [
+ {
+ "product_id": self.product1, # KPI1 = 101 -> error
+ "product_qty": 1,
+ "price_unit": 101,
+ "analytic_distribution": analytic_distribution,
+ },
+ {
+ "product_id": self.product2, # KPI2 = 198
+ "product_qty": 2,
+ "price_unit": 99,
+ "analytic_distribution": analytic_distribution,
+ },
+ ]
+ )
+ # (1) No budget check first
+ self.budget_period.control_budget = False
+ self.budget_period.control_level = "analytic_kpi"
+ # force date commit, as freeze_time not work for write_date
+ expense = expense.with_context(
+ force_date_commit=expense.expense_line_ids[:1].date
+ )
+ expense.action_submit_sheet() # No budget check no error
+ # (2) Check Budget with analytic_kpi -> Error
+ expense.reset_expense_sheets()
+ self.budget_period.control_budget = True # Set to check budget
+ # kpi 1 (kpi1) & CostCenter1, will result in $ -1.00
+ with self.assertRaises(UserError):
+ expense.action_submit_sheet()
+ # (3) Check Budget with analytic -> OK
+ self.budget_period.control_level = "analytic"
+ expense.action_submit_sheet()
+ expense.approve_expense_sheets()
+ self.assertEqual(self.budget_control.amount_balance, 1)
+ expense.reset_expense_sheets()
+ self.assertEqual(self.budget_control.amount_balance, 300)
+ # (4) Amount exceed -> Error
+ expense.expense_line_ids.write({"total_amount": 301})
+ # CostCenter1, will result in $ -1.00
+ with self.assertRaises(UserError):
+ expense.action_submit_sheet()
+
+ @freeze_time("2001-02-01")
+ def test_02_budget_expense_to_journal_posting(self):
+ """Expense to Journal Posting, commit and uncommit"""
+ # Allocate and Done
+ self.budget_control.allocated_amount = 300
+ self.budget_control.action_done()
+
+ # KPI1 = 100, KPI2 = 200, Total = 300
+ self.assertEqual(300, self.budget_control.amount_budget)
+ # Prepare Expense on kpi1 with qty 3 and unit_price 10
+ analytic_distribution = {str(self.costcenter1.id): 100}
+ expense = self._create_expense_sheet(
+ [
+ {
+ "product_id": self.product1, # KPI1
+ "product_qty": 3,
+ "price_unit": 10,
+ "analytic_distribution": analytic_distribution,
+ },
+ ]
+ )
+ self.budget_period.control_budget = True
+ self.budget_period.control_level = "analytic"
+ expense = expense.with_context(
+ force_date_commit=expense.expense_line_ids[:1].date
+ )
+ expense.action_submit_sheet()
+ expense.approve_expense_sheets()
+ # Expense = 30, JE Actual = 0, Balance = 270
+ self.assertEqual(self.budget_control.amount_expense, 30)
+ self.assertEqual(self.budget_control.amount_actual, 0)
+ self.assertEqual(self.budget_control.amount_balance, 270)
+ # Create and post invoice
+ expense.action_sheet_move_create()
+ move = expense.account_move_id
+ self.assertEqual(move.state, "posted")
+ # EX Commit = 0, JE Actual = 30, Balance = 270
+ # Update budget info
+ self.budget_control._compute_budget_info()
+ self.assertEqual(self.budget_control.amount_expense, 0)
+ self.assertEqual(self.budget_control.amount_actual, 30)
+ self.assertEqual(self.budget_control.amount_balance, 270)
+ # Set to draft
+ move.button_draft()
+ # Update budget info
+ self.budget_control._compute_budget_info()
+ self.assertEqual(self.budget_control.amount_expense, 30)
+ self.assertEqual(self.budget_control.amount_actual, 0)
+ self.assertEqual(self.budget_control.amount_balance, 270)
+ # Cancel journal entry, expense no change
+ move.button_cancel()
+ # Update budget info
+ self.budget_control._compute_budget_info()
+ self.assertEqual(self.budget_control.amount_expense, 30)
+ self.assertEqual(self.budget_control.amount_actual, 0)
+ self.assertEqual(self.budget_control.amount_balance, 270)
+
+ @freeze_time("2001-02-01")
+ def test_03_budget_recompute_and_close_budget_move(self):
+ """EX to JE
+ - Test recompute on both EX and JE
+ - Test close on both EX and JE"""
+ # Allocate and Done
+ self.budget_control.allocated_amount = 300
+ self.budget_control.action_done()
+ # KPI1 = 100, KPI2 = 200, Total = 300
+ self.assertEqual(300, self.budget_control.amount_budget)
+ # Prepare Expense on kpi1 with qty 3 and unit_price 10
+ analytic_distribution = {str(self.costcenter1.id): 100}
+ expense = self._create_expense_sheet(
+ [
+ {
+ "product_id": self.product1,
+ "product_qty": 2,
+ "price_unit": 15,
+ "analytic_distribution": analytic_distribution,
+ },
+ {
+ "product_id": self.product2,
+ "product_qty": 4,
+ "price_unit": 10,
+ "analytic_distribution": analytic_distribution,
+ },
+ ]
+ )
+ self.budget_period.control_budget = True
+ self.budget_period.control_level = "analytic"
+ expense = expense.with_context(
+ force_date_commit=expense.expense_line_ids[:1].date
+ )
+ expense.action_submit_sheet()
+ expense.approve_expense_sheets()
+ # Expense = 70, JE Actual = 0
+ self.assertEqual(self.budget_control.amount_expense, 70)
+ self.assertEqual(self.budget_control.amount_actual, 0)
+ # Create and post invoice
+ expense.action_sheet_move_create()
+ move = expense.account_move_id
+ self.assertEqual(move.state, "posted")
+ # EX Commit = 0, JE Actual = 70
+ self.budget_control._compute_budget_info()
+ self.assertEqual(self.budget_control.amount_expense, 0)
+ self.assertEqual(self.budget_control.amount_actual, 70)
+ # Recompute
+ expense.recompute_budget_move()
+ self.budget_control._compute_budget_info()
+ self.assertEqual(self.budget_control.amount_expense, 0)
+ self.assertEqual(self.budget_control.amount_actual, 70)
+ move.recompute_budget_move()
+ self.budget_control._compute_budget_info()
+ self.assertEqual(self.budget_control.amount_expense, 0)
+ self.assertEqual(self.budget_control.amount_actual, 70)
+ # Close
+ expense.close_budget_move()
+ self.budget_control._compute_budget_info()
+ self.assertEqual(self.budget_control.amount_expense, 0)
+ self.assertEqual(self.budget_control.amount_actual, 70)
+ move.close_budget_move()
+ self.budget_control._compute_budget_info()
+ self.assertEqual(self.budget_control.amount_expense, 0)
+ self.assertEqual(self.budget_control.amount_actual, 0)
diff --git a/budget_control_expense/views/budget_commit_forward_view.xml b/budget_control_expense/views/budget_commit_forward_view.xml
new file mode 100644
index 00000000..b2353aa2
--- /dev/null
+++ b/budget_control_expense/views/budget_commit_forward_view.xml
@@ -0,0 +1,30 @@
+
+Budget Control on Expense
+ + +
This module will create budget commitment for expense (to be used as alternate actual source in mis_builder)
+When expense report is approved, hr_expense.budget.commit is created, and when +journal entry is posted, reversed hr_expense.budget.commit is created.
+A new tab “Budget Commitment” is created on expense report for budget user to keep track of the committed budget.
+
+
+Important
+This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status
+Table of contents
+
+
+-
+
- Bug Tracker +
- Credits + +
+
+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 to smash it by providing a detailed and welcomed +feedback.
+Do not contact contributors directly about support or help with technical issues.
+
+
+Credits
+
+
+Authors
+-
+
- Ecosoft +
+
+Contributors
+-
+
- Kitti Upariphutthiphong <kittiu@ecosoft.co.th> +
- Saran Lim. <saranl@ecosoft.co.th> +
+
+
+
+
+
+
+
+
+
+