F : add request_type : 'sale'

joint_buying_product/tests/__init__.py

@@ -1,10 +1,10 @@
 from . import test_abstract
 
-# from . import test_joint_buying_purchase_order
-# from . import test_joint_buying_transport_request
-# from . import test_product
-# from . import test_check_access_product
-# from . import test_check_access_joint_buying_purchase
-# from . import test_tour_report
+from . import test_joint_buying_purchase_order
+from . import test_joint_buying_transport_request
+from . import test_product
+from . import test_check_access_product
+from . import test_check_access_joint_buying_purchase
+from . import test_tour_report
 
 from . import test_joint_buying_transport_request_compute

joint_buying_product/tests/test_joint_buying_transport_request_compute.py

@@ -35,7 +35,8 @@ def test_create_transport_request_joint_buying(self):
         request = order_VEV.transport_request_id
 
         # Check that transport request is created
-        self.assertTrue(order_VEV.transport_request_id)
+        self.assertTrue(request)
+        self.assertEqual(request.request_type, "joint_buying")
 
         # Check can change values
         self.assertFalse(request.can_change_date)

joint_buying_product/tests/test_tour_report.py

@@ -1,12 +1,12 @@
-# Copyright (C) 2021 - Today: GRAP (http://www.grap.coop)
+# Copyright (C) 2023 - Today: GRAP (http://www.grap.coop)
 # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.tests import tagged
 
-from odoo.addons.joint_buying_base.tests.test_tour_report import TestTourReportBase
+from odoo.addons.joint_buying_base.tests import test_tour_report
 
 
 @tagged("post_install", "-at_install")
-class TestTourReportProduct(TestTourReportBase):
+class TestTourReportSale(test_tour_report.TestTourReportBase):
     pass

joint_buying_product_food/tests/test_tour_report.py

@@ -4,9 +4,9 @@
 
 from odoo.tests import tagged
 
-from odoo.addons.joint_buying_product.tests.test_tour_report import TestTourReportBase
+from odoo.addons.joint_buying_base.tests import test_tour_report
 
 
 @tagged("post_install", "-at_install")
-class TestTourReportProductFood(TestTourReportBase):
+class TestTourReportProduct(test_tour_report.TestTourReportBase):
     pass

joint_buying_sale/demo/joint_buying_transport_request.xml

@@ -7,10 +7,10 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 <odoo>
 
     <record id="request_lse_cda_week_0" model="joint.buying.transport.request">
+        <field name="sale_order_id" ref="sale_order_1"/>
         <field name="manual_origin_partner_id" model="res.partner" eval="obj().env.ref('joint_buying_base.company_LSE').joint_buying_partner_id.id"/>
         <field name="manual_destination_partner_id" model="res.partner" eval="obj().env.ref('joint_buying_base.company_CDA').joint_buying_partner_id.id"/>
         <field name="manual_start_date" eval="(DateTime.today() + timedelta(days=-15)).strftime('%Y-%m-%d 07:00')"/>
-        <field name="sale_order_id" ref="sale_order_1" />
     </record>
 
 </odoo>

joint_buying_sale/demo/sale_order.xml

@@ -34,6 +34,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="product_uom_qty">5</field>
         <field name="product_uom" ref="uom.product_uom_unit"/>
         <field name="price_unit">12.00</field>
+        <field name="unit_weight">0.210</field>
     </record>
 
     <!-- Second Sale Order-->
@@ -55,6 +56,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="product_uom_qty">20</field>
         <field name="product_uom" ref="uom.product_uom_unit"/>
         <field name="price_unit">15.00</field>
+        <field name="unit_weight">0.210</field>
     </record>
 
     <record id="sale_order_2_line_2" model="sale.order.line">
@@ -64,6 +66,7 @@ License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
         <field name="product_uom_qty">30</field>
         <field name="product_uom" ref="uom.product_uom_unit"/>
         <field name="price_unit">12.00</field>
+        <field name="unit_weight">0.210</field>
     </record>
 
 </odoo>

joint_buying_sale/models/joint_buying_transport_request.py

@@ -8,14 +8,20 @@
 class JointBuyingTransportRequest(models.Model):
     _inherit = "joint.buying.transport.request"
 
+    request_type = fields.Selection(selection_add=[("sale", "Sale Order")])
+
     sale_order_id = fields.Many2one(
         comodel_name="sale.order",
-        readonly=True,
         help="Sale order in the local database of the"
         " company that requires transport.",
         ondelete="cascade",
     )
 
+    def _get_depends_request_type(self):
+        res = super()._get_depends_request_type()
+        res.append("sale_order_id")
+        return res
+
     def _get_depends_amount_untaxed(self):
         res = super()._get_depends_amount_untaxed()
         res.append("sale_order_id.amount_untaxed")
@@ -30,11 +36,19 @@ def _get_depends_description(self):
         res = super()._get_depends_description()
         res += [
             "sale_order_id.order_line.product_id",
+            "sale_order_id.order_line.product_uom",
             "sale_order_id.order_line.product_uom_qty",
-            "sale_order_id.order_line.product_uom.name",
         ]
         return res
 
+    def _compute_request_type(self):
+        super(
+            JointBuyingTransportRequest, self.filtered(lambda x: not x.sale_order_id)
+        )._compute_request_type()
+
+        for request in self.filtered(lambda x: x.sale_order_id):
+            request.request_type = "sale"
+
     def _compute_amount_untaxed(self):
         super(
             JointBuyingTransportRequest, self.filtered(lambda x: not x.sale_order_id)
@@ -51,6 +65,22 @@ def _compute_total_weight(self):
         for request in self.filtered(lambda x: x.sale_order_id):
             request.total_weight = request.sale_order_id.total_ordered_weight
 
+    def _compute_description(self):
+        super(
+            JointBuyingTransportRequest, self.filtered(lambda x: not x.sale_order_id)
+        )._compute_description()
+
+        for request in self.filtered(lambda x: x.sale_order_id):
+            description = ""
+            for line in request.sale_order_id.order_line:
+                description += (
+                    f"{line.product_id.name}"
+                    "<span style='color:#888;'>"
+                    f" ({line.product_uom_qty} x {line.product_uom.name}) "
+                    "</span>"
+                )
+            request.description = description
+
     def _compute_can_change(self):
         super(
             JointBuyingTransportRequest, self.filtered(lambda x: not x.sale_order_id)

joint_buying_sale/tests/test_joint_buying_transport_request_compute.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2021 - Today: GRAP (http://www.grap.coop)
+# Copyright (C) 2023 - Today: GRAP (http://www.grap.coop)
 # @author: Sylvain LE GAL (https://twitter.com/legalsylvain)
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
@@ -15,4 +15,42 @@ class TestJointBuyingTransportRequest(
     test_joint_buying_transport_request_compute.TestJointBuyingTransportRequest
 ):
     def test_create_transport_request_sale(self):
-        pass
+        sale_order = self.env.ref("joint_buying_sale.sale_order_1")
+        sale_order_line = self.env.ref("joint_buying_sale.sale_order_1_line_1")
+        request = sale_order.joint_buying_transport_request_id
+
+        # Check that transport request is created
+        self.assertTrue(request)
+        self.assertEqual(request.request_type, "sale")
+
+        # Check can change values
+        self.assertTrue(request.can_change_date)
+        self.assertFalse(request.can_change_extra_data)
+        self.assertTrue(request.can_change_partners)
+
+        # Check computation
+        first_description = request.description
+        first_amount_untaxed = request.amount_untaxed
+        first_total_weight = request.total_weight
+
+        # (The order contains Agila x 80 and Charlotte x 60)
+        self.assertIn("(3", first_description)
+        self.assertNotIn("(2222", first_description)
+
+        self.assertEqual(first_amount_untaxed, sale_order.amount_untaxed)
+
+        # self.assertEqual(first_total_weight, sale_order.xxx)
+
+        # Change value of order line qty and check recomputation
+        sale_order_line.product_uom_qty = 2222
+
+        self.assertNotEqual(first_amount_untaxed, request.description)
+        self.assertNotIn("(3", request.description)
+        self.assertIn("(2222", request.description)
+
+        self.assertNotEqual(first_amount_untaxed, request.amount_untaxed)
+        self.assertEqual(request.amount_untaxed, sale_order.amount_untaxed)
+
+        first_total_weight = first_total_weight
+        # self.assertNotEqual(first_total_weight, request.total_weight)
+        # self.assertEqual(request.total_weight, sale_order.total_weight)