odoo-addon-sale-blanket-order 17.0.1.1.2__py3-none-any.whl → 18.0.1.0.0.12__py3-none-any.whl

odoo/addons/sale_blanket_order/i18n/sale_blanket_order.pot

@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Odoo Server 17.0\n"
+"Project-Id-Version: Odoo Server 18.0\n"
 "Report-Msgid-Bugs-To: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,7 +16,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid ""
 "\n"
 "                    You cannot change the type of a sale order line.\n"
@@ -123,27 +122,15 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
-#, python-format
 msgid "An order can't be empty"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__analytic_account_id
-msgid "Analytic Account"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_distribution
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_wizard_line__analytic_distribution
 msgid "Analytic Distribution"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_distribution_search
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_wizard_line__analytic_distribution_search
-msgid "Analytic Distribution Search"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__analytic_precision
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_wizard_line__analytic_precision
@@ -205,7 +192,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
-#, python-format
 msgid ""
 "Can not create Sale Order from Blanket Order lines with different currencies"
 msgstr ""
@@ -219,7 +205,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/sale_orders.py:0
-#, python-format
 msgid ""
 "Cannot confirm order %s as one of the lines refers to a blanket order that "
 "has no remaining quantity."
@@ -300,7 +285,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid "Date Scheduled"
 msgstr ""
 
@@ -320,6 +304,11 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#. module: sale_blanket_order
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_order__disable_adding_lines
+msgid "Disable Adding Lines"
+msgstr ""
+
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_res_config_settings__group_blanket_disable_adding_lines
 msgid "Disable adding more lines to SOs"
@@ -447,11 +436,6 @@ msgstr ""
 msgid "Invoiced quantity"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model_terms:ir.ui.view,arch_db:sale_blanket_order.view_blanket_order_form
-msgid "Invoicing"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__message_is_follower
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__message_is_follower
@@ -500,7 +484,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid "Must have some lines"
 msgstr ""
 
@@ -515,12 +498,6 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__activity_calendar_event_id
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__activity_calendar_event_id
-msgid "Next Activity Calendar Event"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__activity_date_deadline
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__activity_date_deadline
@@ -633,7 +610,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid "Partner is mandatory"
 msgstr ""
 
@@ -649,13 +625,6 @@ msgstr ""
 msgid "Price"
 msgstr ""
 
-#. module: sale_blanket_order
-#. odoo-python
-#: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
-msgid "Price must be greater than zero"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__pricelist_id
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__pricelist_id
@@ -683,7 +652,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid "Quantity must be greater than zero"
 msgstr ""
 
@@ -692,12 +660,6 @@ msgstr ""
 msgid "Quantity to Order"
 msgstr ""
 
-#. module: sale_blanket_order
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__rating_ids
-#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__rating_ids
-msgid "Ratings"
-msgstr ""
-
 #. module: sale_blanket_order
 #: model_terms:ir.ui.view,arch_db:sale_blanket_order.view_blanket_order_search
 msgid "Remaining Qty"
@@ -729,7 +691,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
-#, python-format
 msgid "Sale Blanket Order %s is not open"
 msgstr ""
 
@@ -781,7 +742,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
-#, python-format
 msgid "Sales Orders"
 msgstr ""
 
@@ -842,6 +802,11 @@ msgstr ""
 msgid "Subtotal"
 msgstr ""
 
+#. module: sale_blanket_order
+#: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order__tag_ids
+msgid "Tags"
+msgstr ""
+
 #. module: sale_blanket_order
 #: model:ir.model.fields,field_description:sale_blanket_order.field_sale_blanket_order_line__price_tax
 msgid "Tax"
@@ -868,7 +833,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/sale_orders.py:0
-#, python-format
 msgid ""
 "The currency of the blanket order must match with that of the sale order."
 msgstr ""
@@ -876,21 +840,18 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/sale_orders.py:0
-#, python-format
 msgid "The customer must be equal to the blanket order lines customer"
 msgstr ""
 
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/sale_orders.py:0
-#, python-format
 msgid "The product in the blanket order and in the sales order must match"
 msgstr ""
 
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
-#, python-format
 msgid "The sale has already been completed."
 msgstr ""
 
@@ -948,14 +909,12 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid "Validity date is mandatory"
 msgstr ""
 
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid "Validity date must be in the future"
 msgstr ""
 
@@ -984,7 +943,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid ""
 "You can not delete a blanket order with opened sale orders! Try to cancel "
 "them before."
@@ -993,7 +951,6 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid ""
 "You can not delete an open blanket or with active sale orders! Try to cancel"
 " it before."
@@ -1002,27 +959,23 @@ msgstr ""
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
-#, python-format
 msgid "You can't create a sale order from an expired blanket order!"
 msgstr ""
 
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
-#, python-format
 msgid "You can't order more than the remaining quantities"
 msgstr ""
 
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/wizard/create_sale_orders.py:0
-#, python-format
 msgid "You have to select lines from the same company."
 msgstr ""
 
 #. module: sale_blanket_order
 #. odoo-python
 #: code:addons/sale_blanket_order/models/blanket_orders.py:0
-#, python-format
 msgid "remaining"
 msgstr ""

odoo/addons/sale_blanket_order/models/blanket_orders.py

@@ -1,7 +1,7 @@
 # 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
@@ -62,13 +62,6 @@ class BlanketOrder(models.Model):
         required=True,
     )
     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,
-        domain="['|', ('company_id', '=', False), ('company_id', '=', company_id)]",
-    )
     payment_term_id = fields.Many2one(
         "account.payment.term",
         string="Payment Terms",
@@ -101,6 +94,13 @@ class BlanketOrder(models.Model):
         change_default=True,
         default=lambda self: self.env["crm.team"]._get_default_team_id(),
     )
+    tag_ids = fields.Many2many(
+        comodel_name="crm.tag",
+        relation="sale_blanket_order_tag_rel",
+        column1="blanket_order_id",
+        column2="tag_id",
+        string="Tags",
+    )
     company_id = fields.Many2one(
         comodel_name="res.company",
         required=True,
@@ -110,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(
@@ -236,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."
@@ -256,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
@@ -292,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."
@@ -419,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(
@@ -483,12 +485,14 @@ class BlanketOrderLine(models.Model):
     def _compute_display_name(self):
         if self.env.context.get("from_sale_order"):
             for record in self:
-                name = "[%s]" % record.order_id.name
+                name = f"[{record.order_id.name}]"
                 if record.date_schedule:
                     formatted_date = format_date(record.env, record.date_schedule)
-                    name += " - {}: {}".format(_("Date Scheduled"), formatted_date)
+                    name += " - {}: {}".format(
+                        self.env._("Date Scheduled"), formatted_date
+                    )
                 name += " ({}: {} {})".format(
-                    _("remaining"),
+                    self.env._("remaining"),
                     record.remaining_uom_qty,
                     record.product_uom.name,
                 )
@@ -511,12 +515,11 @@ class BlanketOrderLine(models.Model):
         product_currency = None
         if rule_id:
             pricelist_item = PricelistItem.browse(rule_id)
-            if pricelist_item.pricelist_id.discount_policy == "without_discount":
+            if pricelist_item._show_discount():
                 while (
                     pricelist_item.base == "pricelist"
                     and pricelist_item.base_pricelist_id
-                    and pricelist_item.base_pricelist_id.discount_policy
-                    == "without_discount"
+                    and pricelist_item._show_discount()
                 ):
                     price, rule_id = pricelist_item.base_pricelist_id.with_context(
                         uom=uom.id
@@ -571,9 +574,6 @@ class BlanketOrderLine(models.Model):
             currency=self.currency_id,
         )
 
-        if self.order_id.pricelist_id.discount_policy == "with_discount":
-            return pricelist_price
-
         if not self.pricelist_item_id:
             # No pricelist rule found => no discount from pricelist
             return pricelist_price
@@ -590,7 +590,7 @@ class BlanketOrderLine(models.Model):
 
         return self.pricelist_item_id._compute_price_before_discount(
             product=self.product_id,
-            quantity=self.product_uom_qty or 1.0,
+            quantity=self.original_uom_qty or 1.0,
             uom=self.product_uom,
             date=fields.Date.today(),
             currency=self.currency_id,
@@ -616,15 +616,9 @@ class BlanketOrderLine(models.Model):
             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",
@@ -680,12 +674,9 @@ class BlanketOrderLine(models.Model):
     def _validate(self):
         try:
             for line in self:
-                assert (
-                    not line.display_type and line.price_unit > 0.0
-                ) or line.display_type, _("Price must be greater than zero")
                 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
 
@@ -729,7 +720,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

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
 
 
@@ -15,6 +15,9 @@ class SaleOrder(models.Model):
         string="Origin blanket order",
         related="order_line.blanket_order_line.order_id",
     )
+    disable_adding_lines = fields.Boolean(
+        compute="_compute_disable_adding_lines",
+    )
 
     @api.model
     def _check_exchausted_blanket_order_line(self):
@@ -27,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."
                     )
@@ -41,12 +44,22 @@ 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("blanket_order_id")
+    @api.depends_context("uid")
+    def _compute_disable_adding_lines(self):
+        self.disable_adding_lines = False
+        if self.env.user.has_group(
+            "sale_blanket_order.blanket_orders_disable_adding_lines"
+        ):
+            for order in self:
+                order.disable_adding_lines = order.blanket_order_id
+
 
 class SaleOrderLine(models.Model):
     _inherit = "sale.order.line"
@@ -166,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"
                     )
@@ -178,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/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>

odoo/addons/sale_blanket_order/report/templates.xml

@@ -4,7 +4,7 @@
         <t t-call="web.external_layout">
             <t t-set="doc" t-value="doc.with_context({'lang':doc.partner_id.lang})" />
             <div class="page">
-                <div class="oe_structure" />
+                <div id="oe_structure_div_01" class="oe_structure" />
                 <div class="row">
                     <div class="col-xs-6">
                         <div
@@ -12,8 +12,8 @@
                             t-options='{"widget": "contact", "fields": ["address", "name", "phone", "fax"], "no_marker": True, "phone_icons": True}'
                         />
                         <p t-if="doc.partner_id.vat">VAT: <span
-                                t-field="doc.partner_id.vat"
-                            /></p>
+                            t-field="doc.partner_id.vat"
+                        /></p>
                     </div>
                 </div>
                 <h2>
@@ -118,52 +118,49 @@
                     </tbody>
                 </table>
                 <div class="clearfix">
-                <div class="row">
-                <div
+                    <div class="row">
+                        <div
                             t-attf-class="#{'col-6' if report_type != 'html' else 'col-sm-7 col-md-6'} ms-auto"
                         >
-
-
-                        <table class="table table-sm">
-                            <tr class="border-black">
-                                <td>
-                                    <strong>Subtotal</strong>
-                                </td>
-                                <td class="text-end">
-                                    <span
+                            <table class="table table-sm">
+                                <tr class="border-black">
+                                    <td>
+                                        <strong>Subtotal</strong>
+                                    </td>
+                                    <td class="text-end">
+                                        <span
                                             t-field="doc.amount_untaxed"
                                             t-options='{"widget": "monetary", "display_currency": doc.currency_id}'
                                         />
-                                </td>
-                            </tr>
-                            <tr>
-                                <td>Taxes</td>
-                                <td class="text-end">
-                                    <span
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>Taxes</td>
+                                    <td class="text-end">
+                                        <span
                                             t-field="doc.amount_tax"
                                             t-options='{"widget": "monetary", "display_currency": doc.currency_id}'
                                         />
-                                </td>
-                            </tr>
-                            <tr class="border-black">
-                                <td>
-                                    <strong>Total</strong>
-                                </td>
-                                <td class="text-end">
-                                    <span
+                                    </td>
+                                </tr>
+                                <tr class="border-black">
+                                    <td>
+                                        <strong>Total</strong>
+                                    </td>
+                                    <td class="text-end">
+                                        <span
                                             t-field="doc.amount_total"
                                             t-options='{"widget": "monetary", "display_currency": doc.currency_id}'
                                         />
-                                </td>
-                            </tr>
-                        </table>
-
-                </div>
-                </div>
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                    </div>
                 </div>
 
                 <p t-field="doc.note" />
-                <div class="oe_structure" />
+                <div id="oe_structure_div_02" class="oe_structure" />
             </div>
         </t>
     </template>