Merge branch '15.0' of https://github.com/ecosoft-odoo/budgeting into 15.0-add-budget_control_report

Author: Saran440

.copier-answers.yml

@@ -1,8 +1,9 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.22
+_commit: v1.29
 _src_path: gh:oca/oca-addons-repo-template
 ci: GitHub
 convert_readme_fragments_to_markdown: false
+enable_checklog_odoo: false
 generate_requirements_txt: true
 github_check_license: true
 github_ci_extra_env: {}

.github/workflows/pre-commit.yml

@@ -13,13 +13,13 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
-      - uses: actions/cache@v1
+      - uses: actions/cache@v4
         with:
           path: ~/.cache/pre-commit
           key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Detect unreleased dependencies
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           for reqfile in requirements.txt test-requirements.txt ; do
               if [ -f ${reqfile} ] ; then
@@ -50,7 +50,7 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           persist-credentials: false
       # - name: Install addons and dependencies

.gitignore

@@ -25,6 +25,19 @@ var/
 *.egg
 *.eggs
 
+# Windows installers
+*.msi
+
+# Debian packages
+*.deb
+
+# Redhat packages
+*.rpm
+
+# MacOS packages
+*.dmg
+*.pkg
+
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ exclude: |
   # Files and folders generated by bots, to avoid loops
   ^setup/|/static/description/index\.html$|
   # We don't want to mess with tool-generated files
-  .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
+  .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
   # Maybe reactivate this when all README files include prettier ignore tags?
   ^README\.md$|
   # Library files can have extraneous formatting (even minimized)
@@ -39,7 +39,7 @@ repos:
         language: fail
         files: '[a-zA-Z0-9_]*/i18n/en\.po$'
   - repo: https://github.com/oca/maintainer-tools
-    rev: 9a170331575a265c092ee6b24b845ec508e8ef75
+    rev: d5fab7ee87fceee858a3d01048c78a548974d935
     hooks:
       # update the NOT INSTALLABLE ADDONS section above
       - id: oca-update-pre-commit-excluded-addons
@@ -58,8 +58,10 @@ repos:
     hooks:
       - id: oca-checks-odoo-module
       - id: oca-checks-po
+        args:
+          - --disable=po-pretty-format
   - repo: https://github.com/myint/autoflake
-    rev: v1.4
+    rev: v1.5.3
     hooks:
       - id: autoflake
         args:
@@ -73,25 +75,35 @@ repos:
     rev: 22.3.0
     hooks:
       - id: black
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.4.1
+  - repo: local
     hooks:
       - id: prettier
         name: prettier (with plugin-xml)
+        entry: prettier
+        args:
+          - --write
+          - --list-different
+          - --ignore-unknown
+        types: [text]
+        files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
+        language: node
         additional_dependencies:
           - "prettier@2.4.1"
           - "@prettier/plugin-xml@1.1.0"
-        args:
-          - --plugin=@prettier/plugin-xml
-        files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
-  - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v7.32.0
+  - repo: local
     hooks:
       - id: eslint
-        verbose: true
+        name: eslint
+        entry: eslint
         args:
           - --color
           - --fix
+        verbose: true
+        types: [javascript]
+        language: node
+        additional_dependencies:
+          - "eslint@v7.32.0"
+          - "eslint-plugin-jsdoc@"
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
     hooks:
@@ -138,7 +150,7 @@ repos:
           - --header
           - "# generated from manifests external_dependencies"
   - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+    rev: 5.0.0
     hooks:
       - id: flake8
         name: flake8

budget_allocation/models/base_budget_move.py

@@ -115,7 +115,7 @@ def check_budget_allocation_limit(self, doclines):
             fund_name = docline.fund_id.name
             tag_name = ", ".join(docline.analytic_tag_ids.mapped("name"))
             query_dict = self._get_query_dict(docline)
-            if not any(x["amount_type"] == "1_budget" for x in query_dict):
+            if not any(x["amount_type"] == "10_budget" for x in query_dict):
                 errors.append(
                     _(
                         "%(name)s & %(fund_name)s & %(tag_name)s is not allocated "

budget_allocation/report/budget_source_fund_report.py

@@ -27,7 +27,7 @@ class SourceFundMonitorReport(models.Model):
     fund_group_id = fields.Many2one(comodel_name="budget.source.fund.group")
     amount = fields.Float()
     amount_type = fields.Selection(
-        selection=lambda self: [("1_budget", "Budget")]
+        selection=lambda self: [("10_budget", "Budget")]
         + self._get_budget_amount_type(),
         string="Type",
     )
@@ -50,7 +50,7 @@ def _get_consumed_sources(self):
         return [
             {
                 "model": ("account.move.line", "Account Move Line"),
-                "type": ("8_actual", "Actual"),
+                "type": ("80_actual", "Actual"),
                 "budget_move": ("account_budget_move", "move_line_id"),
                 "source_doc": ("account_move", "move_id"),
             }
@@ -78,7 +78,7 @@ def _get_select_amount_types(self):
                 formatted_dimension_fields = f", {formatted_dimension_fields}"
         for source in self._get_consumed_sources():
             res_model = source["model"][0]  # i.e., account.move.line
-            amount_type = source["type"][0]  # i.e., 8_actual
+            amount_type = source["type"][0]  # i.e., 80_actual
             res_field = source["budget_move"][1]  # i.e., move_line_id
             sql_select[amount_type] = {
                 0: """
@@ -97,7 +97,7 @@ def _get_select_amount_types(self):
                 1::boolean as active %s
                 """
                 % (
-                    amount_type[:1],
+                    amount_type[:2],
                     res_model,
                     res_field,
                     amount_type,
@@ -110,7 +110,7 @@ def _get_from_amount_types(self):
         sql_from = {}
         for source in self._get_consumed_sources():
             budget_table = source["budget_move"][0]  # i.e., account_budget_move
-            amount_type = source["type"][0]  # i.e., 8_actual
+            amount_type = source["type"][0]  # i.e., 80_actual
             sql_from[
                 amount_type
             ] = """
@@ -141,7 +141,7 @@ def _select_budget(self):
             sf.id as fund_id,
             sf_group.id as fund_group_id,
             aa.id as analytic_account_id,
-            '1_budget' as amount_type,
+            '10_budget' as amount_type,
             al.released_amount as amount,
             bp.bm_date_from as date_from,
             bp.bm_date_to as date_to,
@@ -188,7 +188,7 @@ def _get_sql(self):
             select_budget_query[x] for x in key_select_budget_list
         )
         # commitment
-        select_actual_query = self._select_statement("8_actual")
+        select_actual_query = self._select_statement("80_actual")
         key_select_actual_list = sorted(select_budget_query.keys())
         select_actual = ", ".join(
             select_actual_query[x] for x in key_select_actual_list
@@ -198,7 +198,7 @@ def _get_sql(self):
             self._from_budget(),
             self._where_budget(),
             select_actual,
-            self._from_statement("8_actual"),
+            self._from_statement("80_actual"),
             self._where_actual(),
         )
 

budget_allocation_advance_clearing/report/budget_source_fund_report.py

@@ -11,17 +11,17 @@ def _get_consumed_sources(self):
         return super()._get_consumed_sources() + [
             {
                 "model": ("hr.expense", "Expense"),
-                "type": ("4_av_commit", "AV Commit"),
+                "type": ("40_av_commit", "AV Commit"),
                 "budget_move": ("advance_budget_move", "expense_id"),
                 "source_doc": ("hr_expense_sheet", "sheet_id"),
             }
         ]
 
     def _get_sql(self):
-        select_av_query = self._select_statement("4_av_commit")
+        select_av_query = self._select_statement("40_av_commit")
         key_select_list = sorted(select_av_query.keys())
         select_av = ", ".join(select_av_query[x] for x in key_select_list)
         return super()._get_sql() + "union (select {} {})".format(
             select_av,
-            self._from_statement("4_av_commit"),
+            self._from_statement("40_av_commit"),
         )

budget_allocation_contract/report/budget_source_fund_report.py

@@ -11,17 +11,17 @@ def _get_consumed_sources(self):
         return super()._get_consumed_sources() + [
             {
                 "model": ("contract.line", "Contract Line"),
-                "type": ("6_ct_commit", "CT Commit"),
+                "type": ("60_ct_commit", "CT Commit"),
                 "budget_move": ("contract_budget_move", "contract_line_id"),
                 "source_doc": ("contract_contract", "contract_id"),
             }
         ]
 
     def _get_sql(self):
-        select_ct_query = self._select_statement("6_ct_commit")
+        select_ct_query = self._select_statement("60_ct_commit")
         key_select_list = sorted(select_ct_query.keys())
         select_ct = ", ".join(select_ct_query[x] for x in key_select_list)
         return super()._get_sql() + "union (select {} {})".format(
             select_ct,
-            self._from_statement("6_ct_commit"),
+            self._from_statement("60_ct_commit"),
         )

budget_allocation_expense/report/budget_source_fund_report.py

@@ -11,17 +11,17 @@ def _get_consumed_sources(self):
         return super()._get_consumed_sources() + [
             {
                 "model": ("hr.expense", "Expense"),
-                "type": ("5_ex_commit", "EX Commit"),
+                "type": ("50_ex_commit", "EX Commit"),
                 "budget_move": ("expense_budget_move", "expense_id"),
                 "source_doc": ("hr_expense_sheet", "sheet_id"),
             }
         ]
 
     def _get_sql(self):
-        select_ex_query = self._select_statement("5_ex_commit")
+        select_ex_query = self._select_statement("50_ex_commit")
         key_select_list = sorted(select_ex_query.keys())
         select_ex = ", ".join(select_ex_query[x] for x in key_select_list)
         return super()._get_sql() + "union (select {} {})".format(
             select_ex,
-            self._from_statement("5_ex_commit"),
+            self._from_statement("50_ex_commit"),
         )

budget_allocation_purchase/report/budget_source_fund_report.py

@@ -11,17 +11,17 @@ def _get_consumed_sources(self):
         return super()._get_consumed_sources() + [
             {
                 "model": ("purchase.order.line", "Purchase Line"),
-                "type": ("3_po_commit", "PO Commit"),
+                "type": ("30_po_commit", "PO Commit"),
                 "budget_move": ("purchase_budget_move", "purchase_line_id"),
                 "source_doc": ("purchase_order", "purchase_id"),
             }
         ]
 
     def _get_sql(self):
-        select_po_query = self._select_statement("3_po_commit")
+        select_po_query = self._select_statement("30_po_commit")
         key_select_list = sorted(select_po_query.keys())
         select_po = ", ".join(select_po_query[x] for x in key_select_list)
         return super()._get_sql() + "union (select {} {})".format(
             select_po,
-            self._from_statement("3_po_commit"),
+            self._from_statement("30_po_commit"),
         )

budget_allocation_purchase_request/report/budget_source_fund_report.py

@@ -11,7 +11,7 @@ def _get_consumed_sources(self):
         return super()._get_consumed_sources() + [
             {
                 "model": ("purchase.request.line", "Purchase Request Line"),
-                "type": ("2_pr_commit", "PR Commit"),
+                "type": ("20_pr_commit", "PR Commit"),
                 "budget_move": (
                     "purchase_request_budget_move",
                     "purchase_request_line_id",
@@ -21,10 +21,10 @@ def _get_consumed_sources(self):
         ]
 
     def _get_sql(self):
-        select_pr_query = self._select_statement("2_pr_commit")
+        select_pr_query = self._select_statement("20_pr_commit")
         key_select_list = sorted(select_pr_query.keys())
         select_pr = ", ".join(select_pr_query[x] for x in key_select_list)
         return super()._get_sql() + "union (select {} {})".format(
             select_pr,
-            self._from_statement("2_pr_commit"),
+            self._from_statement("20_pr_commit"),
         )

budget_control/models/budget_control.py

@@ -345,7 +345,7 @@ def do_init_budget_commit(self, init):
                     q["amount"]
                     for q in query_data
                     if q["amount"] is not None
-                    and q["amount_type"] not in ["1_budget", "8_actual"]
+                    and q["amount_type"] not in ["10_budget", "80_actual"]
                 )
                 line.update({"amount": abs(balance_commit)})
 

budget_control/models/budget_period.py

@@ -477,7 +477,7 @@ def get_budget_info_from_dataset(self, query, dataset):
             if is_commit:
                 budget_info[col] = -amount  # Negate
                 budget_info["amount_commit"] += budget_info[col]
-            elif amount_type == "8_actual":  # Negate consumed
+            elif amount_type == "80_actual":  # Negate consumed
                 budget_info[col] = -amount
             else:
                 budget_info[col] = amount
@@ -493,10 +493,10 @@ def _budget_info_query(self):
         query = {
             "info_cols": {
                 "amount_budget": (
-                    "1_budget",
+                    "10_budget",
                     False,
                 ),  # (amount_type, is_commit)
-                "amount_actual": ("8_actual", False),
+                "amount_actual": ("80_actual", False),
             },
             "fields": [
                 "analytic_account_id",