fixup! [IMP] #341 ps_planning: select move lines via move's period

tosccolors · Nov 13, 2024 · 3f66a1e · 3f66a1e
1 parent 3ec00bd
commit 3f66a1e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/ps_planning/models/ps_planning_billing_report.py b/ps_planning/models/ps_planning_billing_report.py
@@ -88,11 +88,11 @@ def init(self):
                 WHEN project_invoicing_properties.actual_time_spent THEN (
                     select sum(quantity) / 8
                     from account_move_line aml
-                    join account_move am on aml.move_id=am.id
+                    join ps_invoice psi on aml.ps_invoice_id=psi.id
                     where
                     aml.analytic_account_id=project_project.analytic_account_id
                     and aml.product_uom_id=(select product_uom_hour from xmlids)
-                    and am.period_id=ps_planning_line_planned.range_id
+                    and psi.period_id=ps_planning_line_planned.range_id
                 )
                 WHEN project_invoicing_properties.fixed_amount THEN (
                     select sum(days)
@@ -106,7 +106,7 @@ def init(self):
                 (
                     select sum(aml.price_total)
                     from account_move_line aml
-                    join account_move am on aml.move_id=am.id
+                    join ps_invoice psi on aml.ps_invoice_id=psi.id
                     where
                     aml.analytic_account_id=project_project.analytic_account_id
                     and aml.product_uom_id=(
@@ -119,7 +119,7 @@ def init(self):
                         )
                         END
                     )
-                    and am.period_id=ps_planning_line_planned.range_id
+                    and psi.period_id=ps_planning_line_planned.range_id
                 ) as billed_value
                 FROM
                 ps_contracted_line