odoo-addon-sale-blanket-order 16.0.2.0.0.2__py3-none-any.whl → 18.0.1.2.1__py3-none-any.whl

odoo/addons/sale_blanket_order/tests/test_blanket_orders.py

@@ -15,12 +15,65 @@ class TestSaleBlanketOrders(common.TransactionCase):
         cls.blanket_order_line_obj = cls.env["sale.blanket.order.line"]
         cls.blanket_order_wiz_obj = cls.env["sale.blanket.order.wizard"]
         cls.so_obj = cls.env["sale.order"]
+        cls.product_pricelist_item_obj = cls.env["product.pricelist.item"]
+
+        settings = cls.env["res.config.settings"].with_user(cls.env.user).create({})
+        settings.group_discount_per_so_line = True
+        settings.set_values()
 
         cls.payment_term = cls.env.ref("account.account_payment_term_immediate")
         cls.sale_pricelist = cls.env["product.pricelist"].create(
             {"name": "Test Pricelist", "currency_id": cls.env.ref("base.USD").id}
         )
 
+        # Taxes
+        company_partner = cls.env["res.partner"].create(
+            {
+                "name": __name__,
+                "country_id": cls.env.company.country_id.id,
+            }
+        )
+        company2 = cls.env["res.company"].create(
+            {
+                "name": __name__,
+                "partner_id": company_partner.id,
+            },
+        )
+        cls.env.user.company_ids += company2
+        cls.env = cls.env(
+            context=dict(
+                cls.env.context, allowed_company_ids=[cls.env.company.id, company2.id]
+            )
+        )
+        tax_group1 = cls.env["account.tax.group"].create(
+            {
+                "name": cls.env.company.name,
+                "company_id": cls.env.company.id,
+            }
+        )
+        tax_group2 = cls.env["account.tax.group"].create(
+            {
+                "name": company2.name,
+                "company_id": company2.id,
+            }
+        )
+        cls.tax1 = cls.env["account.tax"].create(
+            {
+                "name": cls.env.company.name,
+                "company_id": cls.env.company.id,
+                "amount": 10,
+                "tax_group_id": tax_group1.id,
+            }
+        )
+        cls.tax2 = cls.env["account.tax"].create(
+            {
+                "name": company2.name,
+                "company_id": company2.id,
+                "amount": 20,
+                "tax_group_id": tax_group2.id,
+            }
+        )
+
         # UoM
         cls.categ_unit = cls.env.ref("uom.product_uom_categ_unit")
         cls.uom_dozen = cls.env["uom.uom"].create(
@@ -48,6 +101,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "type": "consu",
                 "uom_id": cls.env.ref("uom.product_uom_unit").id,
                 "default_code": "PROD_DEL01",
+                "taxes_id": [fields.Command.set([cls.tax1.id, cls.tax2.id])],
             }
         )
         cls.product2 = cls.env["product.product"].create(
@@ -63,6 +117,9 @@ class TestSaleBlanketOrders(common.TransactionCase):
 
         cls.yesterday = date.today() - timedelta(days=1)
         cls.tomorrow = date.today() + timedelta(days=1)
+        cls.analytic_distribution = {
+            str(cls.env.ref("analytic.analytic_internal").id): 100,
+        }
 
     def test_01_create_blanket_order(self):
         """We create a blanket order and check constrains to confirm BO"""
@@ -73,9 +130,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -83,9 +138,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                             "price_unit": 0.0,  # will be updated later
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "name": "My section",
                             "display_type": "line_section",
@@ -95,11 +148,24 @@ class TestSaleBlanketOrders(common.TransactionCase):
             }
         )
         blanket_order.sudo().onchange_partner_id()
-        blanket_order.pricelist_id.discount_policy = "without_discount"
+
+        pricelist_item = self.product_pricelist_item_obj.search(
+            [("pricelist_id", "=", blanket_order.pricelist_id.id)], limit=1
+        )
+        if not pricelist_item:
+            pricelist_item = self.product_pricelist_item_obj.create(
+                {
+                    "pricelist_id": blanket_order.pricelist_id.id,
+                    "fixed_price": 10.0,
+                }
+            )
+
         blanket_order.line_ids[0].sudo().onchange_product()
-        blanket_order.pricelist_id.discount_policy = "with_discount"
+        self.assertEqual(blanket_order.line_ids[0].taxes_id, self.tax1)
+
+        pricelist_item.write({"compute_price": "percentage"})
         blanket_order.line_ids[0].sudo().onchange_product()
-        blanket_order.line_ids[0].sudo()._get_display_price(self.product)
+        blanket_order.line_ids[0].sudo()._get_display_price()
 
         self.assertEqual(blanket_order.state, "draft")
 
@@ -128,9 +194,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": False,
                             "product_uom": False,
@@ -138,10 +202,9 @@ class TestSaleBlanketOrders(common.TransactionCase):
                             "display_type": "line_section",
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
+                            "analytic_distribution": self.analytic_distribution,
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
                             "original_uom_qty": 20.0,
@@ -178,6 +241,12 @@ class TestSaleBlanketOrders(common.TransactionCase):
         for so in sos:
             self.assertEqual(so.origin, blanket_order.name)
 
+        # Analytic distribution is propagated to the sale line
+        self.assertEqual(
+            sos[0].order_line.filtered("product_id").analytic_distribution,
+            self.analytic_distribution,
+        )
+
     def test_03_create_sale_orders_from_blanket_order_line(self):
         """We create a blanket order and create two sale orders
         from the blanket order lines"""
@@ -188,9 +257,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -198,9 +265,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                             "price_unit": 30.0,
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product2.id,
                             "product_uom": self.product2.uom_id.id,
@@ -239,9 +304,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "pricelist_id": self.sale_pricelist.id,
                 "currency_id": self.sale_pricelist.currency_id.id,
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -249,9 +312,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                             "price_unit": 30.0,
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product2.id,
                             "product_uom": self.product2.uom_id.id,
@@ -273,9 +334,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "order_line": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -283,9 +342,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                             "price_unit": 30.0,
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product2.id,
                             "product_uom": self.product2.uom_id.id,
@@ -310,9 +367,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.uom_dozen.id,
@@ -332,9 +387,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "order_line": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -361,9 +414,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -371,9 +422,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
                             "price_unit": 30.0,
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product2.id,
                             "product_uom": self.product2.uom_id.id,
@@ -390,10 +439,10 @@ class TestSaleBlanketOrders(common.TransactionCase):
         wizard1 = self.blanket_order_wiz_obj.with_context(
             active_id=blanket_order.id, active_model="sale.blanket.order"
         ).create({})
-        wizard1.line_ids.filtered(lambda l: l.product_id == self.product).write(
+        wizard1.line_ids.filtered(lambda line: line.product_id == self.product).write(
             {"qty": 10.0}
         )
-        wizard1.line_ids.filtered(lambda l: l.product_id == self.product2).write(
+        wizard1.line_ids.filtered(lambda line: line.product_id == self.product2).write(
             {"qty": 10.0}
         )
         wizard1.sudo().create_sale_order()
@@ -401,10 +450,10 @@ class TestSaleBlanketOrders(common.TransactionCase):
         wizard2 = self.blanket_order_wiz_obj.with_context(
             active_id=blanket_order.id, active_model="sale.blanket.order"
         ).create({})
-        wizard2.line_ids.filtered(lambda l: l.product_id == self.product).write(
+        wizard2.line_ids.filtered(lambda line: line.product_id == self.product).write(
             {"qty": 20.0}
         )
-        wizard2.line_ids.filtered(lambda l: l.product_id == self.product2).write(
+        wizard2.line_ids.filtered(lambda line: line.product_id == self.product2).write(
             {"qty": 0}
         )
         wizard2.sudo().create_sale_order()
@@ -412,7 +461,7 @@ class TestSaleBlanketOrders(common.TransactionCase):
         wizard3 = self.blanket_order_wiz_obj.with_context(
             active_id=blanket_order.id, active_model="sale.blanket.order"
         ).create({})
-        wizard3.line_ids.filtered(lambda l: l.product_id == self.product2).write(
+        wizard3.line_ids.filtered(lambda line: line.product_id == self.product2).write(
             {"qty": 10.0}
         )
         wizard3.sudo().create_sale_order()

odoo/addons/sale_blanket_order/tests/test_sale_order.py

@@ -52,9 +52,7 @@ class TestSaleOrder(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -65,9 +63,7 @@ class TestSaleOrder(common.TransactionCase):
                             "price_unit": 30.0,
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -92,9 +88,7 @@ class TestSaleOrder(common.TransactionCase):
                 "payment_term_id": self.payment_term.id,
                 "pricelist_id": self.sale_pricelist.id,
                 "line_ids": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product.id,
                             "product_uom": self.product.uom_id.id,
@@ -102,9 +96,7 @@ class TestSaleOrder(common.TransactionCase):
                             "price_unit": 30.0,
                         },
                     ),
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "product_id": self.product_2.id,
                             "product_uom": self.product.uom_id.id,
@@ -130,9 +122,7 @@ class TestSaleOrder(common.TransactionCase):
             {
                 "partner_id": self.partner.id,
                 "order_line": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "name": self.product.name,
                             "product_id": self.product.id,
@@ -145,7 +135,6 @@ class TestSaleOrder(common.TransactionCase):
             }
         )
         so_line = so.order_line[0]
-        so_line.with_context(from_sale_order=True).name_get()
         so_line.onchange_product_id()
         self.assertEqual(so_line._get_eligible_bo_lines(), bo_lines)
         bo_line_assigned = self.blanket_order_line_obj.search(
@@ -165,9 +154,7 @@ class TestSaleOrder(common.TransactionCase):
             {
                 "partner_id": self.partner.id,
                 "order_line": [
-                    (
-                        0,
-                        0,
+                    fields.Command.create(
                         {
                             "name": self.product.name,
                             "product_id": self.product.id,
@@ -180,11 +167,10 @@ class TestSaleOrder(common.TransactionCase):
             }
         )
         so_line = so.order_line[0]
-        so_line.with_context(from_sale_order=True).name_get()
         so_line.onchange_product_id()
         self.assertEqual(
             so_line._get_eligible_bo_lines(),
-            bo_lines.filtered(lambda l: l.product_id == self.product),
+            bo_lines.filtered(lambda bo_line: bo_line.product_id == self.product),
         )
         bo_line_assigned = self.blanket_order_line_obj.search(
             [
@@ -194,62 +180,3 @@ class TestSaleOrder(common.TransactionCase):
             ]
         )
         self.assertEqual(so_line.blanket_order_line, bo_line_assigned)
-
-    def test_03_create_sale_order(self):
-        blanket_order = self.create_blanket_order_01()
-        blanket_order.sudo().action_confirm()
-        bo_lines = self.blanket_order_line_obj.search(
-            [("order_id", "=", blanket_order.id)]
-        )
-        self.assertEqual(len(bo_lines), 2)
-
-        so = self.sale_order_obj.create(
-            {
-                "partner_id": self.partner.id,
-                "order_line": [
-                    (
-                        0,
-                        0,
-                        {
-                            "name": self.product_2.name,
-                            "product_id": self.product_2.id,
-                            "product_uom_qty": 5.0,
-                            "product_uom": self.product_2.uom_po_id.id,
-                            "price_unit": 10.0,
-                        },
-                    ),
-                    (
-                        0,
-                        0,
-                        {
-                            "name": self.product.name,
-                            "product_id": self.product.id,
-                            "product_uom_qty": 5.0,
-                            "product_uom": self.product.uom_po_id.id,
-                            "price_unit": 10.0,
-                        },
-                    ),
-                ],
-            }
-        )
-        so_line_1 = so.order_line[0]
-        so_line_2 = so.order_line[1]
-        so_line_1.with_context(from_sale_order=True).name_get()
-        so_line_1.onchange_product_id()
-        self.assertFalse(so_line_1._get_eligible_bo_lines())
-        so_line_2.with_context(from_sale_order=True).name_get()
-        so_line_2.onchange_product_id()
-        self.assertEqual(
-            so_line_2._get_eligible_bo_lines(),
-            bo_lines.filtered(lambda l: l.product_id == self.product),
-        )
-        bo_line_assigned = self.blanket_order_line_obj.search(
-            [
-                ("order_id", "=", blanket_order.id),
-                ("product_id", "=", self.product.id),
-                ("date_schedule", "=", fields.Date.to_string(self.date_schedule_1)),
-            ]
-        )
-        self.assertFalse(so_line_1.blanket_order_line)
-        self.assertEqual(so_line_2.blanket_order_line, bo_line_assigned)
-        self.assertEqual(so.blanket_order_id, blanket_order)

odoo/addons/sale_blanket_order/views/sale_blanket_order_line_views.xml

@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- VIEWS -->
 
     <record id="sale_blanket_order_line_tree" model="ir.ui.view">
-        <field name="name">sale.blanket.order.line.tree</field>
+        <field name="name">sale.blanket.order.line.list</field>
         <field name="model">sale.blanket.order.line</field>
         <field name="arch" type="xml">
-            <tree create="false">
+            <list create="false">
                 <field name="sequence" widget="handle" />
-                <field name="name" invisible="1" />
                 <field name="order_id" />
                 <field
                     name="product_id"
                     context="{'partner_id':parent.partner_id, 'quantity':original_uom_qty, 'company_id': company_id}"
                 />
-                <field name="product_uom" invisible="1" />
                 <field name="price_unit" />
                 <field name="date_schedule" />
                 <field
@@ -27,8 +24,7 @@
                 <field name="invoiced_uom_qty" />
                 <field name="delivered_uom_qty" />
                 <field name="remaining_uom_qty" />
-                <field name="company_id" invisible="1" />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -37,7 +33,7 @@
         <field name="model">sale.blanket.order.line</field>
         <field name="priority" eval="20" />
         <field name="arch" type="xml">
-            <form string="Sale Blanket Order Line" duplicate="false">
+            <form string="Sale Blanket Order Line" duplicate="false" create="false">
                 <sheet>
                     <h1>
                         <field name="order_id" />
@@ -126,18 +122,14 @@
                         <page name="sale_lines" string="Sale Order Lines">
                             <field
                                 name="sale_lines"
-                                mode="tree"
+                                mode="list"
                                 readonly="1"
                                 domain="[('product_id', '=', product_id)]"
                             />
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" widget="mail_followers" />
-                    <field name="activity_ids" widget="mail_activity" />
-                    <field name="message_ids" widget="mail_thread" />
-                </div>
+                <chatter />
             </form>
         </field>
     </record>
@@ -163,7 +155,7 @@
         <field name="name">Blanket Order Lines</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.blanket.order.line</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="search_view_id" ref="sale_blanket_order_line_search" />
     </record>
 
@@ -176,5 +168,4 @@
         sequence="21"
         parent="sale.sale_order_menu"
     />
-
 </odoo>