Merge pull request #50 from akretion/16-mig-project-invoice-subcontra…

…ctor 16 mig project invoice subcontractor
akretion · Aug 1, 2024 · cd7c7c1 · cd7c7c1
2 parents 3734190 + ea77100
commit cd7c7c1
Show file tree

Hide file tree

Showing 17 changed files with 321 additions and 381 deletions.
diff --git a/project_invoicing_subcontractor/__manifest__.py b/project_invoicing_subcontractor/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "project_invoicing_subcontractor",
-    "version": "14.0.1.0.2",
+    "version": "16.0.1.0.0",
     "author": "Akretion",
     "website": "https://github.com/akretion/subcontractor",
     "license": "AGPL-3",
@@ -14,6 +14,7 @@
         "hr_timesheet_sheet",
         "account_invoice_subcontractor",
         "project_time_in_day",
+        "account_analytic_simple",
     ],
     "data": [
         "security/ir.model.access.csv",

diff --git a/project_invoicing_subcontractor/demo/account_account.xml b/project_invoicing_subcontractor/demo/account_account.xml
@@ -4,39 +4,39 @@
     <record id="account_revenue_consulting" model="account.account">
         <field name="name">Service Consulting</field>
         <field name="code">706140</field>
-        <field name="user_type_id" ref="account.data_account_type_revenue" />
+        <field name="account_type">income</field>
     </record>
 
     <record id="account_revenue_maintenance" model="account.account">
         <field name="name">Service Maintenance</field>
         <field name="code">706150</field>
-        <field name="user_type_id" ref="account.data_account_type_revenue" />
+        <field name="account_type">income</field>
     </record>
 
     <record id="account_expense_consulting" model="account.account">
         <field name="name">Consulting subcontracting</field>
         <field name="code">611140</field>
-        <field name="user_type_id" ref="account.data_account_type_expenses" />
+        <field name="account_type">expense</field>
     </record>
 
     <record id="account_expense_maintenance" model="account.account">
         <field name="name">Maintenance Subcontracting</field>
         <field name="code">611150</field>
-        <field name="user_type_id" ref="account.data_account_type_expenses" />
+        <field name="account_type">expense</field>
     </record>
 
     <record id="account_expense_internal" model="account.account">
         <field name="name">Internal task cost</field>
         <field name="code">611160</field>
-        <field name="user_type_id" ref="account.data_account_type_expenses" />
+        <field name="account_type">expense</field>
     </record>
 
     <record id="account_prepaid_customer_maintenance" model="account.account">
         <field name="name">Prepaid Revenues (maintenance)</field>
         <field name="code">418101</field>
         <field name="reconcile" eval="False" />
         <field name="is_prepaid_account" eval="True" />
-        <field name="user_type_id" ref="account.data_account_type_current_assets" />
+        <field name="account_type">liability_current</field>
     </record>
 
 </odoo>
diff --git a/project_invoicing_subcontractor/demo/project_demo.xml b/project_invoicing_subcontractor/demo/project_demo.xml
@@ -17,7 +17,7 @@
 
     <!-- Tasks -->
     <record id="project_task_1" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_1" />
         <field name="name">Task 1</field>
@@ -26,7 +26,7 @@
     </record>
 
     <record id="project_task_2" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_1" />
         <field name="name">Task 2</field>
@@ -35,7 +35,7 @@
     </record>
 
     <record id="project_task_3" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_1" />
         <field name="name">Task 3</field>
@@ -44,7 +44,7 @@
     </record>
 
     <record id="project_task_4" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_1" />
         <field name="name">Task 4</field>
@@ -152,7 +152,7 @@
 
     <!-- Tasks -->
     <record id="project_2_task_1" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_2" />
         <field name="name">Task 1</field>
@@ -161,7 +161,7 @@
     </record>
 
     <record id="project_2_task_2" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_2" />
         <field name="name">Task 2</field>
@@ -170,7 +170,7 @@
     </record>
 
     <record id="project_2_task_3" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_2" />
         <field name="name">Task 3</field>
@@ -179,7 +179,7 @@
     </record>
 
     <record id="project_2_task_4" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_2" />
         <field name="name">Task 4</field>
@@ -287,7 +287,7 @@
 
     <!-- Tasks -->
     <record id="project_task_1_proj3" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_3" />
         <field name="name">Task 1</field>
@@ -324,7 +324,7 @@
 
     <!-- Tasks -->
     <record id="project_task_1_proj4" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_4" />
         <field name="name">Task 1</field>
@@ -333,7 +333,7 @@
     </record>
 
     <record id="project_task_2_proj4" model="project.task">
-        <field name="user_id" ref="base.user_demo" />
+        <field name="user_ids" eval="[(4, ref('base.user_demo'))]" />
         <field name="priority">0</field>
         <field name="project_id" ref="project_project_4" />
         <field name="name">Task 2</field>

diff --git a/project_invoicing_subcontractor/migrations/14.0.1.0.0/post-migration.py b/project_invoicing_subcontractor/migrations/14.0.1.0.0/post-migration.py
diff --git a/project_invoicing_subcontractor/migrations/14.0.1.0.0/pre-migration.py b/project_invoicing_subcontractor/migrations/14.0.1.0.0/pre-migration.py
diff --git a/project_invoicing_subcontractor/models/__init__.py b/project_invoicing_subcontractor/models/__init__.py
@@ -1,5 +1,7 @@
-from . import project
+from . import project_project
+from . import project_task
 from . import account_move
+from . import account_move_line
 from . import subcontractor_work
 from . import account_analytic_line
 from . import project_invoice_typology

diff --git a/project_invoicing_subcontractor/models/account_analytic_account.py b/project_invoicing_subcontractor/models/account_analytic_account.py
@@ -9,9 +9,13 @@ class AccountAnalyticAccount(models.Model):
     available_amount = fields.Monetary(compute="_compute_prepaid_amount")
     prepaid_total_amount = fields.Monetary(compute="_compute_prepaid_amount")
     prepaid_available_amount = fields.Monetary(compute="_compute_prepaid_amount")
-    account_move_line_ids = fields.One2many("account.move.line", "analytic_account_id")
+    prepaid_move_line_ids = fields.One2many(
+        "account.move.line",
+        "analytic_account_id",
+        domain=[("is_prepaid_line", "=", True)],
+    )
 
-    @api.depends("account_move_line_ids.prepaid_is_paid")
+    @api.depends("prepaid_move_line_ids.prepaid_is_paid")
     def _compute_prepaid_amount(self):
         for account in self:
             move_lines, paid_lines = account._prepaid_move_lines()
@@ -46,13 +50,13 @@ def _prepaid_move_lines(self):
             ],
         )
         paid_lines = move_lines.filtered(
-            lambda m: m.prepaid_is_paid
+            lambda line: line.prepaid_is_paid
             or (
-                m.move_id.supplier_invoice_ids
+                line.move_id.supplier_invoice_ids
                 and all(
                     [
                         x.to_pay and x.payment_state != "paid"
-                        for x in m.move_id.supplier_invoice_ids
+                        for x in line.move_id.supplier_invoice_ids
                     ]
                 )
             )