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/models/blanket_orders.py

@@ -1,13 +1,11 @@
 # Copyright 2018 ACSONE SA/NV
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import SUPERUSER_ID, _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 from odoo.tools import float_is_zero
 from odoo.tools.misc import format_date
 
-from odoo.addons.sale.models.sale_order import READONLY_FIELD_STATES
-
 
 class BlanketOrder(models.Model):
     _name = "sale.blanket.order"
@@ -44,7 +42,6 @@ class BlanketOrder(models.Model):
     partner_id = fields.Many2one(
         "res.partner",
         string="Partner",
-        states=READONLY_FIELD_STATES,
     )
     line_ids = fields.One2many(
         "sale.blanket.order.line", "order_id", string="Order lines", copy=True
@@ -63,21 +60,11 @@ class BlanketOrder(models.Model):
         "product.pricelist",
         string="Pricelist",
         required=True,
-        states=READONLY_FIELD_STATES,
     )
     currency_id = fields.Many2one("res.currency", related="pricelist_id.currency_id")
-    analytic_account_id = fields.Many2one(
-        comodel_name="account.analytic.account",
-        string="Analytic Account",
-        copy=False,
-        check_company=True,
-        states=READONLY_FIELD_STATES,
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
-    )
     payment_term_id = fields.Many2one(
         "account.payment.term",
         string="Payment Terms",
-        states=READONLY_FIELD_STATES,
     )
     confirmed = fields.Boolean(copy=False)
     state = fields.Selection(
@@ -91,26 +78,21 @@ class BlanketOrder(models.Model):
         store=True,
         copy=False,
     )
-    validity_date = fields.Date(
-        states=READONLY_FIELD_STATES,
-    )
+    validity_date = fields.Date()
     client_order_ref = fields.Char(
         string="Customer Reference",
         copy=False,
-        states=READONLY_FIELD_STATES,
     )
-    note = fields.Text(default=_default_note, states=READONLY_FIELD_STATES)
+    note = fields.Text(default=_default_note)
     user_id = fields.Many2one(
         "res.users",
         string="Salesperson",
-        states=READONLY_FIELD_STATES,
     )
     team_id = fields.Many2one(
         "crm.team",
         string="Sales Team",
         change_default=True,
         default=lambda self: self.env["crm.team"]._get_default_team_id(),
-        states=READONLY_FIELD_STATES,
     )
     tag_ids = fields.Many2many(
         comodel_name="crm.tag",
@@ -128,7 +110,9 @@ class BlanketOrder(models.Model):
     sale_count = fields.Integer(compute="_compute_sale_count")
 
     fiscal_position_id = fields.Many2one(
-        "account.fiscal.position", string="Fiscal Position"
+        "account.fiscal.position",
+        string="Fiscal Position",
+        check_company=True,
     )
 
     amount_untaxed = fields.Monetary(
@@ -205,7 +189,7 @@ class BlanketOrder(models.Model):
                 order.state = "expired"
             elif float_is_zero(
                 sum(
-                    order.line_ids.filtered(lambda l: not l.display_type).mapped(
+                    order.line_ids.filtered(lambda line: not line.display_type).mapped(
                         "remaining_uom_qty"
                     )
                 ),
@@ -254,15 +238,15 @@ class BlanketOrder(models.Model):
 
         if self.partner_id.user_id:
             values["user_id"] = self.partner_id.user_id.id
-        if self.partner_id.team_id:
-            values["team_id"] = self.partner_id.team_id.id
+        if self.partner_id.user_id.sale_team_id:
+            values["team_id"] = self.partner_id.user_id.sale_team_id.id
         self.update(values)
 
     def unlink(self):
         for order in self:
             if order.state not in ("draft", "expired") or order._check_active_orders():
                 raise UserError(
-                    _(
+                    self.env._(
                         "You can not delete an open blanket or "
                         "with active sale orders! "
                         "Try to cancel it before."
@@ -274,12 +258,12 @@ class BlanketOrder(models.Model):
         try:
             today = fields.Date.today()
             for order in self:
-                assert order.validity_date, _("Validity date is mandatory")
-                assert order.validity_date > today, _(
+                assert order.validity_date, self.env._("Validity date is mandatory")
+                assert order.validity_date > today, self.env._(
                     "Validity date must be in the future"
                 )
-                assert order.partner_id, _("Partner is mandatory")
-                assert len(order.line_ids) > 0, _("Must have some lines")
+                assert order.partner_id, self.env._("Partner is mandatory")
+                assert len(order.line_ids) > 0, self.env._("Must have some lines")
                 order.line_ids._validate()
         except AssertionError as e:
             raise UserError(e) from e
@@ -310,7 +294,7 @@ class BlanketOrder(models.Model):
         for order in self:
             if order._check_active_orders():
                 raise UserError(
-                    _(
+                    self.env._(
                         "You can not delete a blanket order with opened "
                         "sale orders! "
                         "Try to cancel them before."
@@ -437,9 +421,9 @@ class BlanketOrderLine(models.Model):
     product_uom = fields.Many2one("uom.uom", string="Unit of Measure")
     price_unit = fields.Float(string="Price", digits="Product Price")
     taxes_id = fields.Many2many(
-        "account.tax",
-        string="Taxes",
-        domain=["|", ("active", "=", False), ("active", "=", True)],
+        comodel_name="account.tax",
+        context={"active_test": False},
+        check_company=True,
     )
     date_schedule = fields.Date(string="Scheduled Date")
     original_uom_qty = fields.Float(
@@ -490,115 +474,53 @@ class BlanketOrderLine(models.Model):
         default=False,
         help="Technical field for UX purpose.",
     )
+    pricelist_item_id = fields.Many2one(
+        comodel_name="product.pricelist.item", compute="_compute_pricelist_item_id"
+    )
 
-    def name_get(self):
-        result = []
+    @api.depends(
+        "order_id.name", "date_schedule", "remaining_uom_qty", "product_uom.name"
+    )
+    @api.depends_context("from_sale_order")
+    def _compute_display_name(self):
         if self.env.context.get("from_sale_order"):
             for record in self:
-                res = "[%s]" % record.order_id.name
+                name = f"[{record.order_id.name}]"
                 if record.date_schedule:
                     formatted_date = format_date(record.env, record.date_schedule)
-                    res += " - {}: {}".format(_("Date Scheduled"), formatted_date)
-                res += " ({}: {} {})".format(
-                    _("remaining"),
+                    name += " - {}: {}".format(
+                        self.env._("Date Scheduled"), formatted_date
+                    )
+                name += " ({}: {} {})".format(
+                    self.env._("remaining"),
                     record.remaining_uom_qty,
                     record.product_uom.name,
                 )
-                result.append((record.id, res))
-            return result
-        return super().name_get()
-
-    def _get_real_price_currency(self, product, rule_id, qty, uom, pricelist_id):
-        """Retrieve the price before applying the pricelist
-        :param obj product: object of current product record
-        :param float qty: total quentity of product
-        :param tuple price_and_rule: tuple(price, suitable_rule) coming
-               from pricelist computation
-        :param obj uom: unit of measure of current order line
-        :param integer pricelist_id: pricelist id of sale order"""
-        # Copied and adapted from the sale module
-        PricelistItem = self.env["product.pricelist.item"]
-        field_name = "lst_price"
-        currency_id = None
-        product_currency = None
-        if rule_id:
-            pricelist_item = PricelistItem.browse(rule_id)
-            if pricelist_item.pricelist_id.discount_policy == "without_discount":
-                while (
-                    pricelist_item.base == "pricelist"
-                    and pricelist_item.base_pricelist_id
-                    and pricelist_item.base_pricelist_id.discount_policy
-                    == "without_discount"
-                ):
-                    price, rule_id = pricelist_item.base_pricelist_id.with_context(
-                        uom=uom.id
-                    )._get_product_price_rule(product, qty, uom)
-                    pricelist_item = PricelistItem.browse(rule_id)
-
-            if pricelist_item.base == "standard_price":
-                field_name = "standard_price"
-            if pricelist_item.base == "pricelist" and pricelist_item.base_pricelist_id:
-                field_name = "price"
-                product = product.with_context(
-                    pricelist=pricelist_item.base_pricelist_id.id
-                )
-                product_currency = pricelist_item.base_pricelist_id.currency_id
-            currency_id = pricelist_item.pricelist_id.currency_id
-
-        product_currency = (
-            product_currency
-            or (product.company_id and product.company_id.currency_id)
-            or self.env.company.currency_id
-        )
-        if not currency_id:
-            currency_id = product_currency
-            cur_factor = 1.0
-        else:
-            if currency_id.id == product_currency.id:
-                cur_factor = 1.0
-            else:
-                cur_factor = currency_id._get_conversion_rate(
-                    product_currency, currency_id
-                )
-
-        product_uom = product.uom_id.id
-        if uom and uom.id != product_uom:
-            # the unit price is in a different uom
-            uom_factor = uom._compute_price(1.0, product.uom_id)
+                record.display_name = name
         else:
-            uom_factor = 1.0
+            return super()._compute_display_name()
 
-        return product[field_name] * uom_factor * cur_factor, currency_id.id
+    def _get_display_price(self):
+        # Copied and adapted from the sale module
+        # No need to call _get_pricelist_price_before_discount()
+        # since BO lines cannot have discounts
+        # TODO: handle combos the way Odoo does in the sale module
+        self.ensure_one()
+        pricelist_price = self._get_pricelist_price()
+        return pricelist_price
 
-    def _get_display_price(self, product):
+    def _get_pricelist_price(self):
         # Copied and adapted from the sale module
         self.ensure_one()
-        pricelist = self.order_id.pricelist_id
-        partner = self.order_id.partner_id
-        if self.order_id.pricelist_id.discount_policy == "with_discount":
-            return product.with_context(pricelist=pricelist.id).lst_price
-        final_price, rule_id = pricelist._get_product_price_rule(
-            self.product_id, self.original_uom_qty or 1.0, self.product_uom
-        )
-        context_partner = dict(
-            self.env.context, partner_id=partner.id, date=fields.Date.today()
+        self.product_id.ensure_one()
+        price = self.pricelist_item_id._compute_price(
+            product=self.product_id,
+            quantity=self.original_uom_qty or 1.0,
+            uom=self.product_uom,
+            date=fields.Date.today(),
+            currency=self.currency_id,
         )
-        base_price, currency_id = self.with_context(
-            **context_partner
-        )._get_real_price_currency(
-            self.product_id,
-            rule_id,
-            self.original_uom_qty,
-            self.product_uom,
-            pricelist.id,
-        )
-        if currency_id != pricelist.currency_id.id:
-            currency = self.env["res.currency"].browse(currency_id)
-            base_price = currency.with_context(**context_partner).compute(
-                base_price, pricelist.currency_id
-            )
-        # negative discounts (= surcharge) are included in the display price
-        return max(base_price, final_price)
+        return price
 
     @api.onchange("product_id", "original_uom_qty")
     def onchange_product(self):
@@ -612,23 +534,17 @@ class BlanketOrderLine(models.Model):
             if self.order_id.partner_id and float_is_zero(
                 self.price_unit, precision_digits=precision
             ):
-                self.price_unit = self._get_display_price(self.product_id)
+                self.price_unit = self._get_display_price()
             if self.product_id.code:
-                name = "[{}] {}".format(name, self.product_id.code)
+                name = f"[{name}] {self.product_id.code}"
             if self.product_id.description_sale:
                 name += "\n" + self.product_id.description_sale
             self.name = name
 
             fpos = self.order_id.fiscal_position_id
-            if self.env.uid == SUPERUSER_ID:
-                company_id = self.env.company.id
-                self.taxes_id = fpos.map_tax(
-                    self.product_id.taxes_id.filtered(
-                        lambda r: r.company_id.id == company_id
-                    )
-                )
-            else:
-                self.taxes_id = fpos.map_tax(self.product_id.taxes_id)
+            self.taxes_id = fpos.map_tax(
+                self.product_id.taxes_id._filter_taxes_by_company(self.company_id)
+            )
 
     @api.depends(
         "sale_lines.order_id.state",
@@ -663,12 +579,30 @@ class BlanketOrderLine(models.Model):
                 line.remaining_uom_qty, line.product_id.uom_id
             )
 
+    @api.depends("product_id", "product_uom", "original_uom_qty")
+    def _compute_pricelist_item_id(self):
+        # Copied and adapted from the sale module
+        for line in self:
+            if (
+                not line.product_id
+                or line.display_type
+                or not line.order_id.pricelist_id
+            ):
+                line.pricelist_item_id = False
+            else:
+                line.pricelist_item_id = line.order_id.pricelist_id._get_product_rule(
+                    line.product_id,
+                    quantity=line.original_uom_qty or 1.0,
+                    uom=line.product_uom,
+                    date=fields.Date.today(),
+                )
+
     def _validate(self):
         try:
             for line in self:
                 assert (
                     not line.display_type and line.original_uom_qty > 0.0
-                ) or line.display_type, _("Quantity must be greater than zero")
+                ) or line.display_type, self.env._("Quantity must be greater than zero")
         except AssertionError as e:
             raise UserError(e) from e
 
@@ -712,7 +646,7 @@ class BlanketOrderLine(models.Model):
             lambda line: line.display_type != values.get("display_type")
         ):
             raise UserError(
-                _(
+                self.env._(
                     """
                     You cannot change the type of a sale order line.
                     Instead you should delete the current line and create a new line
@@ -720,4 +654,4 @@ class BlanketOrderLine(models.Model):
                     """
                 )
             )
-        return super(BlanketOrderLine, self).write(values)
+        return super().write(values)

odoo/addons/sale_blanket_order/models/sale_config_settings.py

@@ -5,7 +5,6 @@ from odoo import fields, models
 
 
 class SaleConfigSettings(models.TransientModel):
-
     _inherit = "res.config.settings"
 
     group_blanket_disable_adding_lines = fields.Boolean(

odoo/addons/sale_blanket_order/models/sale_orders.py

@@ -3,7 +3,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from datetime import date, timedelta
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 
@@ -13,7 +13,7 @@ class SaleOrder(models.Model):
     blanket_order_id = fields.Many2one(
         "sale.blanket.order",
         string="Origin blanket order",
-        compute="_compute_blanket_order_id",
+        related="order_line.blanket_order_line.order_id",
     )
     disable_adding_lines = fields.Boolean(
         compute="_compute_disable_adding_lines",
@@ -30,7 +30,7 @@ class SaleOrder(models.Model):
         for order in self:
             if order._check_exchausted_blanket_order_line():
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "Cannot confirm order %s as one of the lines refers "
                         "to a blanket order that has no remaining quantity."
                     )
@@ -44,18 +44,12 @@ class SaleOrder(models.Model):
             if line.blanket_order_line:
                 if line.blanket_order_line.partner_id != self.partner_id:
                     raise ValidationError(
-                        _(
+                        self.env._(
                             "The customer must be equal to the "
                             "blanket order lines customer"
                         )
                     )
 
-    @api.depends("order_line.blanket_order_line.order_id")
-    def _compute_blanket_order_id(self):
-        for order in self:
-            blanket_order = order.order_line.mapped("blanket_order_line.order_id")
-            order.blanket_order_id = blanket_order[:1]
-
     @api.depends("blanket_order_id")
     @api.depends_context("uid")
     def _compute_disable_adding_lines(self):
@@ -80,14 +74,14 @@ class SaleOrderLine(models.Model):
         assigned_bo_line = False
         date_planned = date.today()
         date_delta = timedelta(days=365)
-        for line in bo_lines.filtered(lambda l: l.date_schedule):
+        for line in bo_lines.filtered(lambda bo_line: bo_line.date_schedule):
             date_schedule = line.date_schedule
             if date_schedule and abs(date_schedule - date_planned) < date_delta:
                 assigned_bo_line = line
                 date_delta = abs(date_schedule - date_planned)
         if assigned_bo_line:
             return assigned_bo_line
-        non_date_bo_lines = bo_lines.filtered(lambda l: not l.date_schedule)
+        non_date_bo_lines = bo_lines.filtered(lambda bo_line: not bo_line.date_schedule)
         if non_date_bo_lines:
             return non_date_bo_lines[0]
 
@@ -185,7 +179,7 @@ class SaleOrderLine(models.Model):
                 and line.product_id != line.blanket_order_line.product_id
             ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "The product in the blanket order and in the "
                         "sales order must match"
                     )
@@ -197,7 +191,7 @@ class SaleOrderLine(models.Model):
             if line.blanket_order_line:
                 if line.currency_id != line.blanket_order_line.order_id.currency_id:
                     raise ValidationError(
-                        _(
+                        self.env._(
                             "The currency of the blanket order must match with "
                             "that of the sale order."
                         )

odoo/addons/sale_blanket_order/readme/CONTEXT.md

@@ -0,0 +1,5 @@
+Others modules provide similar features. The module (sale_order_blanket_order)[https://pypi.org/project/odoo-addon-sale-order-blanket-order] also defines the concept of sale blanket order. The main differences are:
+
+* This module integrates Blanket Orders and Call-Off Orders into the sale.blanket.order object, whereas the other module extends the sale.order object. This means that any extensions made to the sale order model can also apply to blanket orders.
+
+* In the other module, you can deliver and invoice directly from the blanket order. You can also create a separate call-off order to partially deliver the blanket order.

odoo/addons/sale_blanket_order/readme/CONTRIBUTORS.md

@@ -0,0 +1,17 @@
+- André Pereira \<<github@andreparames.com>\> (<https://www.acsone.eu/>)
+
+- Adrià Gil Sorribes \<<adria.gil@eficent.com>\>
+  (<https://www.eficent.com/>)
+
+- Jordi Ballester Alomar \<<jordi.ballester@eficent.com>\>
+
+- Alex Comba \<<alex.comba@agilebg.com>\> (<https://www.agilebg.com/>)
+
+- Codeforward (https://www.codeforward.nl/):
+
+  > - Jasper Jumelet \<<jasper.jumelet@codeforward.nl>\>
+  > - Chris Bergman \<<chris.bergman@codeforward.nl>\>
+
+- [Trobz](https://trobz.com):
+
+  > - Nguyễn Minh Chiến \<<chien@trobz.com>\>

odoo/addons/sale_blanket_order/readme/{CREDITS.rst → CREDITS.md}

@@ -1 +1,2 @@
-The migration of this module from 15.0 to 16.0 was financially supported by Camptocamp
+The migration of this module from 15.0 to 16.0 was financially supported
+by Camptocamp

odoo/addons/sale_blanket_order/readme/DESCRIPTION.md

@@ -0,0 +1,5 @@
+A blanket order is a pre-agreement to sell a certain number of
+quantities of products at a specific price. From a confirmed blanket
+order, the users can create new sale orders at such price, until the
+blanket order expires, either due to reaching the validity date or
+exhausting all the quantities of products.

odoo/addons/sale_blanket_order/readme/ROADMAP.md

@@ -0,0 +1,3 @@
+- Currently, combo products are not supported in blanket orders nor blanket
+  order lines, they are treated as regular products. Future versions of the
+  module should include support for these types of products.

odoo/addons/sale_blanket_order/readme/USAGE.md

@@ -0,0 +1,58 @@
+A new menu in the Sales area is created, allowing users to create new
+blanket orders.
+
+To create a new Sale Blanket Order go to the sale menu in the Sales
+section:
+
+![](../static/description/BO_menu.png)
+
+Hitting the button create will open the form view in which we can
+introduce the following information:
+
+- Vendor
+
+- Salesperson
+
+- Payment Terms
+
+- Validity date
+
+- Order lines:  
+  - Product
+  - Accorded price
+  - Original, Ordered, Invoiced, Received and Remaining quantities
+
+- Terms and Conditions of the Blanket Order
+
+![](../static/description/BO_form.png)
+
+From the form, once the Blanket Order has been confirmed and its state
+is open, the user can create a Sale Order, check the Sale Orders
+associated to the Blanket Order and/or see the Blanket Order lines
+associated to the BO.
+
+![](../static/description/BO_actions.png)
+
+Hitting the button Create Sale Order will open a wizard that will ask
+for the amount of each product in the BO lines for which the Sale Order
+will be created.
+
+![](../static/description/PO_from_BO.png)
+
+Installing this module will add an additional menu which will show all
+the blanket order lines currently defined in the system. From this list
+the user can create customized Sale Orders selecting the lines for which
+the PO (or POs if the customers are different) is (are) created.
+
+![](../static/description/BO_lines.png)
+
+In the Sale Order form one field is added in the PO lines, the Blanket
+Order line field. This field keeps track to which Blanket Order line the
+PO line is associated. Upon adding a new product in a newly created Sale
+Order a blanket order line will be suggested depending on the following
+factors:
+
+- Closer Validity date
+- Remaining quantity \> Quantity introduced in the Sale Order line
+
+![](../static/description/PO_BOLine.png)

odoo/addons/sale_blanket_order/report/report.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <record id="report_blanket_order" model="ir.actions.report">
         <field name="name">Blanket Order</field>
         <field name="model">sale.blanket.order</field>
@@ -14,5 +13,4 @@
         />
         <field name="binding_type">report</field>
     </record>
-
 </odoo>