Merge pull request #425 from ecosoft-odoo/15.0-fix-budget_allocation-…

…query_fund_without_date [15.0][FIX] budget_allocation: query source fund data without date
ecosoft-odoo · Feb 11, 2024 · 4c5c979 · 4c5c979
2 parents 6d760bb + 68ba7ce
commit 4c5c979
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/budget_allocation/report/budget_source_fund_report.py b/budget_allocation/report/budget_source_fund_report.py
@@ -90,8 +90,9 @@ def _get_select_amount_types(self):
                 a.analytic_account_id,
                 '%s' as amount_type,
                 a.credit-a.debit as amount,
-                aa.bm_date_from as date_from,
-                aa.bm_date_to as date_to,
+                -- change aa.bm_date_from, aa.bm_date_to to a.date
+                a.date as date_from,
+                a.date as date_to,
                 1::boolean as allocation_active,
                 1::boolean as active %s
                 """

diff --git a/budget_allocation/report/budget_source_fund_report_view.xml b/budget_allocation/report/budget_source_fund_report_view.xml
@@ -42,11 +42,6 @@
             <search string="Source of Fund Monitoring">
                 <field name="fund_id" string="Source of Fund" />
                 <separator orientation="vertical" />
-                <filter
-                    name="current_period"
-                    string="Current Period"
-                    domain="[('date_to', '&gt;=', context_today().strftime('%Y-%m-%d')), ('date_from', '&lt;=', context_today().strftime('%Y-%m-%d'))]"
-                />
                 <filter
                     name="active"
                     string="Unarchived"
@@ -87,9 +82,7 @@
         <field name="name">Source of Fund Monitoring</field>
         <field name="res_model">budget.source.fund.report</field>
         <field name="view_mode">pivot,tree,graph</field>
-        <field
-            name="context"
-        >{'group_by':[], 'group_by_no_leaf':1, 'search_default_current_period': 1}</field>
+        <field name="context">{'group_by':[], 'group_by_no_leaf':1}</field>
         <field name="search_view_id" ref="view_source_fund_monitor_report_search" />
     </record>
     <menuitem