odoo-addon-project-task-stock 18.0.1.1.0.2__py3-none-any.whl → 18.0.1.1.1__py3-none-any.whl

odoo/addons/project_task_stock/README.rst

@@ -11,7 +11,7 @@ Project Task Stock
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:242c581176cfc77f755cc535f6cd33d657b87ea678afb0ccaa09569d68d94aeb
+   !! source digest: sha256:65971a0d7ce3f10a5014265783a2b32623bca6083f66874f109f4dfc8cf0f009
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

odoo/addons/project_task_stock/__manifest__.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Project Task Stock",
-    "version": "18.0.1.1.0",
+    "version": "18.0.1.1.1",
     "category": "Project Management",
     "website": "https://github.com/OCA/project",
     "author": "Tecnativa, Odoo Community Association (OCA)",

odoo/addons/project_task_stock/models/stock_move.py

@@ -1,5 +1,6 @@
 # Copyright 2022-2025 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl)
+
 from odoo import api, fields, models
 from odoo.tools import float_is_zero
 
@@ -90,32 +91,39 @@ class StockMove(models.Model):
         product = self.product_id
         company_id = self.env.company
         task = self.task_id or self.raw_material_task_id
-        analytic_account = task.stock_analytic_account_id or task.project_id.account_id
+        project_id = task.project_id
+        analytic_account = task.stock_analytic_account_id or project_id.account_id
         if not analytic_account:
             return False
         # Apply sudo() in case there is any rule that does not allow access to
         # the analytic account, for example with analytic_hr_department_restriction
         analytic_account = analytic_account.sudo()
+        is_return = bool(
+            self.origin_returned_move_id
+            and self.location_id == project_id.location_dest_id
+            and self.location_dest_id == project_id.location_id
+        )
+        quantity_done = self.quantity * (-1 if is_return else 1)
         res = {
             "date": (
                 task.stock_analytic_date
-                or task.project_id.stock_analytic_date
+                or project_id.stock_analytic_date
                 or fields.date.today()
             ),
             "name": task.name + ": " + product.name,
-            "unit_amount": self.quantity,
+            "unit_amount": quantity_done,
             "account_id": analytic_account.id,
             "user_id": self.env.user.id,
             "product_uom_id": self.product_uom.id,
             "company_id": analytic_account.company_id.id or self.env.company.id,
-            "partner_id": task.partner_id.id or task.project_id.partner_id.id or False,
+            "partner_id": task.partner_id.id or project_id.partner_id.id or False,
             "stock_move_id": self.id,
             "stock_task_id": task.id,
         }
         amount_unit = product.with_context(uom=self.product_uom.id)._price_compute(
             "standard_price"
         )[product.id]
-        amount = amount_unit * self.quantity or 0.0
+        amount = amount_unit * quantity_done or 0.0
         result = round(amount, company_id.currency_id.decimal_places) * -1
         vals = {"amount": result}
         analytic_line_fields = self.env["account.analytic.line"]._fields

odoo/addons/project_task_stock/static/description/index.html

@@ -372,7 +372,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:242c581176cfc77f755cc535f6cd33d657b87ea678afb0ccaa09569d68d94aeb
+!! source digest: sha256:65971a0d7ce3f10a5014265783a2b32623bca6083f66874f109f4dfc8cf0f009
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/project/tree/18.0/project_task_stock"><img alt="OCA/project" src="https://img.shields.io/badge/github-OCA%2Fproject-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/project-18-0/project-18-0-project_task_stock"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/project&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to consume products directly from a project task.</p>

odoo/addons/project_task_stock/tests/test_project_task_stock.py

@@ -147,6 +147,45 @@ class TestProjectTaskStock(TestProjectStockBase):
             fields.first(self.task.stock_analytic_line_ids).date, fields.date.today()
         )
 
+    def test_project_task_analytic_lines_with_returned_picking(self):
+        # Create initial moves
+        self.task = self.env["project.task"].browse(self.task.id)
+        self.task.action_assign()
+        picking = self.task.move_ids.picking_id
+        for move in picking.move_ids:
+            move.quantity = move.product_uom_qty
+        picking.button_validate()
+        self.assertEqual(picking.state, "done")
+        # Return the initial moves
+        stock_return_picking_form = Form(
+            self.env["stock.return.picking"].with_context(
+                active_ids=picking.ids,
+                active_id=picking.id,
+                active_model="stock.picking",
+            )
+        )
+        stock_return_picking = stock_return_picking_form.save()
+        for return_line in stock_return_picking.product_return_moves:
+            return_line.quantity = return_line.move_id.product_uom_qty
+        stock_return_picking_action = stock_return_picking.action_create_returns()
+        return_pick = self.env["stock.picking"].browse(
+            stock_return_picking_action["res_id"]
+        )
+        return_pick.action_assign()
+        for return_line in return_pick.move_ids:
+            return_line.quantity = return_line.origin_returned_move_id.quantity
+        return_pick.button_validate()
+        self.assertEqual(return_pick.state, "done")
+        # Check that the resulting analytic lines sum is 0
+        stock_analytic_lines = self.task.sudo().stock_analytic_line_ids
+        self.assertEqual(len(stock_analytic_lines), 4)
+        self.assertEqual(sum(stock_analytic_lines.mapped("unit_amount")), 0)
+        self.assertEqual(sum(stock_analytic_lines.mapped("amount")), 0)
+        self.assertIn(
+            self.analytic_account,
+            stock_analytic_lines.mapped("account_id"),
+        )
+
     @users("manager-user")
     def test_project_task_analytic_lines_with_tag_2_manager_user(self):
         self.task.stock_analytic_distribution = {

{odoo_addon_project_task_stock-18.0.1.1.0.2.dist-info → odoo_addon_project_task_stock-18.0.1.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-project_task_stock
-Version: 18.0.1.1.0.2
+Version: 18.0.1.1.1
 Requires-Python: >=3.10
 Requires-Dist: odoo==18.0.*
 Summary: Project Task Stock
@@ -27,7 +27,7 @@ Project Task Stock
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:242c581176cfc77f755cc535f6cd33d657b87ea678afb0ccaa09569d68d94aeb
+   !! source digest: sha256:65971a0d7ce3f10a5014265783a2b32623bca6083f66874f109f4dfc8cf0f009
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

{odoo_addon_project_task_stock-18.0.1.1.0.2.dist-info → odoo_addon_project_task_stock-18.0.1.1.1.dist-info}/RECORD

@@ -1,6 +1,6 @@
-odoo/addons/project_task_stock/README.rst,sha256=pLBIxdWYtNWiObNyzUTOYW5XhisWB0tgbAshFVtaMvM,5159
+odoo/addons/project_task_stock/README.rst,sha256=qgmBXgjN-TboYRKaphNJ9nLwcgUdnauUfWR6hK-8C3k,5159
 odoo/addons/project_task_stock/__init__.py,sha256=X9EJGOE2GtZbS0G82PtSXmWSZ_R8jEM0rlJTDliQjp4,21
-odoo/addons/project_task_stock/__manifest__.py,sha256=uU6kBxOzKrAPZb_wghhKWDy1hEr06E4NVuIfasuVwYg,775
+odoo/addons/project_task_stock/__manifest__.py,sha256=SQ2l4w2u1cKpm052oSwahgElows2J9N17wzviwGxHI0,775
 odoo/addons/project_task_stock/demo/project_data.xml,sha256=GbYSbj5CiOQHyAeQtdBWMbHajJyVDytBf50cBJv4tpI,1123
 odoo/addons/project_task_stock/demo/stock_picking_type_data.xml,sha256=c5i4QCAiyQe56NABAUPSJMEMQ9lgr7D1QzzW3M5N-hY,525
 odoo/addons/project_task_stock/i18n/es.po,sha256=s3RyWdAFRh7OmgK9cuDcjVONSzzoxDvc4J9GtbuX87Q,13360
@@ -13,7 +13,7 @@ odoo/addons/project_task_stock/models/__init__.py,sha256=I5RT15Ty8nTgrnFlAVrkxRb
 odoo/addons/project_task_stock/models/account_analytic_line.py,sha256=RSND1vjwTJlunJoFa1mPaJqfns8Q0DtsHE-cxAToB7A,974
 odoo/addons/project_task_stock/models/project_project.py,sha256=Qf_kkL7KUQxNo4XNJ28SruRlbK0Zy0sejYvWz6vLISk,1545
 odoo/addons/project_task_stock/models/project_task.py,sha256=GTSPAJVP0zokAS-13b1vUtg7_aDl_5_e6H8U_O49DTg,10182
-odoo/addons/project_task_stock/models/stock_move.py,sha256=eV6JpeafFT_o1TLWBf_YUP_P4bVflbrl0rd54cKPmGg,8565
+odoo/addons/project_task_stock/models/stock_move.py,sha256=5a2PIa5YZtGsK_UutJV27pii0M2bEc-MfCvCuHS8jTM,8858
 odoo/addons/project_task_stock/models/stock_scrap.py,sha256=zIHRHbc4cqtLeuIYtGGRvQDAKPFRdyGcJ-_NrrP3jlQ,875
 odoo/addons/project_task_stock/readme/CONFIGURE.md,sha256=4XwAh_S4bnXRLEWh5qSs9odeJFvtDvPEArQfq3fQUhg,903
 odoo/addons/project_task_stock/readme/CONTRIBUTORS.md,sha256=7B3TJAW9bVCbc9-u4HKUamqJSM0J1p_Z_47T3M3uXxE,83
@@ -21,16 +21,16 @@ odoo/addons/project_task_stock/readme/DESCRIPTION.md,sha256=QokztTE5MwpfnbAogx3V
 odoo/addons/project_task_stock/readme/ROADMAP.md,sha256=O5Fz1skeLk6S4CTmbHzscRXYOGfCBY_gtCAEf_E47Gw,109
 odoo/addons/project_task_stock/readme/USAGE.md,sha256=eOWL0QCwPpokebB-EJDovHkJSDT9ztTUSoEp1W0YY3I,845
 odoo/addons/project_task_stock/static/description/icon.png,sha256=6xBPJauaFOF0KDHfHgQopSc28kKvxMaeoQFQWZtfZDo,9455
-odoo/addons/project_task_stock/static/description/index.html,sha256=Wjbq8YFE4goQBMBPTXdeCVqq7jbyPmAVN4UQDYjCtYc,15358
+odoo/addons/project_task_stock/static/description/index.html,sha256=Z8o7M7bhiL-0JcVJJrJkquY8hKLr3QxT1sYypjP7CBc,15358
 odoo/addons/project_task_stock/tests/__init__.py,sha256=t2gqBJiFaqp2rOwkMCOmAnRKCBGKOddjpE4WVCMTJ3o,150
 odoo/addons/project_task_stock/tests/common.py,sha256=D_YbTvpSut235e35T8oDK6wb4ODDfAZOzkd1q2gPRHM,3705
-odoo/addons/project_task_stock/tests/test_project_task_stock.py,sha256=ycaHyuI8E3iA_E-XX_JXbDhsfc79fdVEO1lYR9n3Oxg,16896
+odoo/addons/project_task_stock/tests/test_project_task_stock.py,sha256=6ZIdMbUtN1kDLVUbNTfkAySznP9qLenUS3mQXf62xGc,18716
 odoo/addons/project_task_stock/views/project_project_view.xml,sha256=guERwgs5MebLRq0EMA8Nu8oWjMdVPOwZlJE8P-ER1yw,994
 odoo/addons/project_task_stock/views/project_task_type_view.xml,sha256=PuhMxiLk_brwDCFw9fQMUKCx6CmxjUcJXx_EnsY2G34,555
 odoo/addons/project_task_stock/views/project_task_view.xml,sha256=UI3NQ3QeDAzkSlZtL_k_mr2aFrGNxFihb8PmdaAShuk,6451
 odoo/addons/project_task_stock/views/stock_move_view.xml,sha256=uguTAZaMh7bOwuo9f9G0hCVcr9-xOhKimOVT0zUw8_U,3236
 odoo/addons/project_task_stock/views/stock_scrap_views.xml,sha256=sOCk3Nv159QHO3gqiuVubbUH1mWHgKTwOURXnkWsxno,507
-odoo_addon_project_task_stock-18.0.1.1.0.2.dist-info/METADATA,sha256=u3a7yYADqbMLtjz48JZuTXSs_KWlvMaD4WeX2-LHGLs,5695
-odoo_addon_project_task_stock-18.0.1.1.0.2.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
-odoo_addon_project_task_stock-18.0.1.1.0.2.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
-odoo_addon_project_task_stock-18.0.1.1.0.2.dist-info/RECORD,,
+odoo_addon_project_task_stock-18.0.1.1.1.dist-info/METADATA,sha256=pHASiN3VCAKtnfiUaDf3F3Z5UITpUJMS7ek1O-yl5jA,5693
+odoo_addon_project_task_stock-18.0.1.1.1.dist-info/WHEEL,sha256=ZhOvUsYhy81Dx67gN3TV0RchQWBIIzutDZaJODDg2Vo,81
+odoo_addon_project_task_stock-18.0.1.1.1.dist-info/top_level.txt,sha256=QE6RBQ0QX5f4eFuUcGgU5Kbq1A_qJcDs-e_vpr6pmfU,4
+odoo_addon_project_task_stock-18.0.1.1.1.dist-info/RECORD,,