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

odoo/addons/sale_blanket_order/views/sale_blanket_order_views.xml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
-
     <!-- VIEWS -->
 
     <record id="view_blanket_order_tree" model="ir.ui.view">
-        <field name="name">sale.blanket.order.tree</field>
+        <field name="name">sale.blanket.order.list</field>
         <field name="model">sale.blanket.order</field>
         <field name="arch" type="xml">
-            <tree
+            <list
                 decoration-info="state == 'draft'"
                 decoration-muted="state == 'expired'"
             >
@@ -22,7 +21,7 @@
                     optional="show"
                     readonly="1"
                 />
-            </tree>
+            </list>
         </field>
     </record>
 
@@ -37,25 +36,25 @@
                         string="Create Sale Order"
                         type="action"
                         class="btn-primary"
-                        attrs="{'invisible': [('state', '!=', 'open')]}"
+                        invisible="state != 'open'"
                     />
                     <button
                         name="set_to_draft"
-                        states="expired,done"
+                        invisible="state not in ['expired', 'done']"
                         string="To Draft"
                         class="btn-secondary"
                         type="object"
                     />
                     <button
                         name="action_cancel"
-                        states="open"
+                        invisible="state != 'open'"
                         string="Cancel"
                         class="btn-secondary"
                         type="object"
                     />
                     <button
                         name="action_confirm"
-                        states="draft"
+                        invisible="state != 'draft'"
                         string="Confirm"
                         class="btn-primary o_sale_confirm"
                         type="object"
@@ -84,7 +83,7 @@
                             type="object"
                             name="action_view_sale_blanket_order_line"
                             class="oe_stat_button"
-                            attrs="{'invisible':[('line_count', '=', 0)]}"
+                            invisible="not line_count"
                             icon="fa-list"
                         >
                             <field name="line_count" widget="statinfo" string="Lines" />
@@ -100,7 +99,7 @@
                             <field
                                 name="partner_id"
                                 context="{'res_partner_search_mode': 'customer', 'show_address': 1}"
-                                attrs="{'required': [('state', '=', 'draft')]}"
+                                required="state == 'draft'"
                                 options="{&quot;always_reload&quot;: True}"
                             />
                             <field name="payment_term_id" />
@@ -112,20 +111,17 @@
                                 options="{'no_create': True}"
                             />
                             <field name="company_id" invisible="1" />
-                            <field
-                                name="validity_date"
-                                attrs="{'required': [('state', '=', 'draft')]}"
-                            />
+                            <field name="validity_date" required="state == 'draft'" />
                         </group>
                     </group>
                     <notebook>
                         <page string="Order Lines" name="order_lines">
                             <field
                                 name="line_ids"
-                                attrs="{'readonly': [('state', 'in', ('open','done','expired'))]}"
+                                readonly="state in ['open', 'done', 'expired']"
                                 widget="section_and_note_one2many"
                             >
-                                <tree editable="bottom">
+                                <list editable="bottom">
                                     <control>
                                         <create
                                             name="add_product_control"
@@ -142,14 +138,15 @@
                                             context="{'default_display_type': 'line_note'}"
                                         />
                                     </control>
-                                    <field name="display_type" invisible="1" />
+                                    <field
+                                        name="display_type"
+                                        column_invisible="True"
+                                    />
                                     <field name="sequence" widget="handle" />
                                     <field
                                         name="product_id"
-                                        attrs="{
-                                            'required': [('display_type', '=', False)],
-                                            'invisible': [('display_type', '=', True)],
-                                        }"
+                                        required="not display_type"
+                                        invisible="display_type"
                                         context="{
                                             'fld': 'product_id',
                                             'partner_id': parent.partner_id,
@@ -181,14 +178,12 @@
                                             'quantity': original_uom_qty,
                                             'company_id': parent.company_id
                                         }"
-                                        attrs="{
-                                            'required': [('display_type', '=', False)],
-                                            'invisible': [('display_type', '=', True)],
-                                        }"
+                                        required="not display_type"
+                                        invisible="display_type"
                                     />
                                     <field
                                         name="product_uom"
-                                        invisible="1"
+                                        column_invisible="True"
                                         groups="!uom.group_uom"
                                     />
                                     <field
@@ -198,10 +193,8 @@
                                     />
                                     <field
                                         name="price_unit"
-                                        attrs="{
-                                            'required': [('display_type', '=', False)],
-                                            'invisible': [('display_type', '=', True)],
-                                        }"
+                                        required="not display_type"
+                                        invisible="display_type"
                                     />
                                     <field name="date_schedule" />
                                     <field name="ordered_uom_qty" optional="hide" />
@@ -211,23 +204,18 @@
                                     <field
                                         name="taxes_id"
                                         widget="many2many_tags"
-                                        domain="[('type_tax_use','=','sale')]"
-                                        context="{'default_type_tax_use': 'sale'}"
+                                        domain="[('type_tax_use', '=', 'sale'), ('company_id', 'parent_of', parent.company_id)]"
+                                        context="{'search_view_ref': 'account.account_tax_view_search'}"
                                         options="{'no_create': True}"
-                                        attrs="{
-                                            'required': [('display_type', '=', False)],
-                                            'invisible': [('display_type', '=', True)],
-                                        }"
+                                        invisible="display_type"
                                     />
                                     <field
                                         name="price_subtotal"
                                         widget="monetary"
-                                        attrs="{
-                                            'invisible': [('display_type', '=', True)],
-                                        }"
+                                        invisible="display_type"
                                     />
                                     <field name="company_id" invisible="1" />
-                                </tree>
+                                </list>
                             </field>
                             <group class="oe_subtotal_footer oe_right">
                                 <field
@@ -266,7 +254,7 @@
                                 <group string="Sales Information" name="sales_person">
                                     <field
                                         name="pricelist_id"
-                                        attrs="{'required': [('state', '=', 'draft')]}"
+                                        required="state == 'draft'"
                                     />
                                     <field name="user_id" />
                                     <field
@@ -274,31 +262,22 @@
                                         options="{'no_create': True}"
                                     />
                                     <field name="client_order_ref" />
+                                    <field
+                                        name="tag_ids"
+                                        widget="many2many_tags"
+                                        options="{'color_field': 'color', 'no_create_edit': True}"
+                                    />
                                     <field
                                         name="company_id"
                                         options="{'no_create': True}"
                                         groups="base.group_multi_company"
                                     />
                                 </group>
-                                <group name="invoicing" string="Invoicing">
-                                    <t groups="base.group_multi_company">
-                                        <field
-                                            name="analytic_account_id"
-                                            attrs="{'readonly': [('sale_count','!=',0),('state','!=','draft')]}"
-                                            groups="analytic.group_analytic_accounting"
-                                            force_save="1"
-                                        />
-                                    </t>
-                                </group>
                             </group>
                         </page>
                     </notebook>
                 </sheet>
-                <div class="oe_chatter">
-                    <field name="message_follower_ids" />
-                    <field name="activity_ids" />
-                    <field name="message_ids" />
-                </div>
+                <chatter />
             </form>
         </field>
     </record>
@@ -354,7 +333,7 @@
         <field name="name">Blanket Orders</field>
         <field name="type">ir.actions.act_window</field>
         <field name="res_model">sale.blanket.order</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">list,form</field>
         <field name="search_view_id" ref="view_blanket_order_search" />
         <field name="domain">[]</field>
         <field name="context">{}</field>
@@ -379,5 +358,4 @@
         sequence="20"
         action="act_open_blanket_order_view"
     />
-
 </odoo>

odoo/addons/sale_blanket_order/views/sale_config_settings.xml

@@ -7,25 +7,17 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="sale.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath
-                expr="//div[hasclass('row','mt16','o_settings_container')][position() = 3]"
-                position="after"
-            >
-                <h2>Blanket Orders</h2>
-                <div class="row mt16 o_settings_container">
-                    <div class="col-xs-12 col-md-6 o_setting_box">
-                        <div class="o_setting_left_pane">
-                            <field name="group_blanket_disable_adding_lines" />
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="group_blanket_disable_adding_lines" />
-                            <div class="text-muted" id="sale_config_website_quote">
-                                Disable adding more lines to SOs from Blanket Orders
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </xpath>
+            <block name="quotation_order_setting_container" position="after">
+                <block title="Blanket Orders" name="blanket_orders_setting_container">
+                    <setting
+                        id="group_blanket_disable_adding_lines"
+                        title="Disable adding more lines to SOs from Blanket Orders"
+                        help="Disable adding more lines to SOs from Blanket Orders"
+                    >
+                        <field name="group_blanket_disable_adding_lines" />
+                    </setting>
+                </block>
+            </block>
         </field>
     </record>
 </odoo>

odoo/addons/sale_blanket_order/views/sale_order_views.xml

@@ -8,19 +8,19 @@
             <field name="currency_id" position="after">
                 <field name="blanket_order_id" invisible="1" />
             </field>
+            <xpath expr="//field[@name='order_line']" position="attributes">
+                <attribute name="context">{'from_sale_order': True}</attribute>
+            </xpath>
             <xpath
-                expr="//field[@name='order_line']//tree/field[@name='product_id']"
+                expr="//field[@name='order_line']//list/field[@name='product_template_id']"
                 position="after"
             >
                 <field
                     name="blanket_order_line"
                     context="{'from_sale_order': True}"
-                    attrs="{'column_invisible': [('parent.blanket_order_id', '=', False)]}"
+                    column_invisible="not parent.blanket_order_id"
                 />
             </xpath>
-            <xpath expr="//field[@name='order_line']" position="attributes">
-                <attribute name="context">{'from_sale_order': True}</attribute>
-            </xpath>
         </field>
     </record>
     <record id="view_order_form_disable_adding_lines" model="ir.ui.view">
@@ -28,10 +28,8 @@
         <field name="model">sale.order</field>
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='order_line']//tree" position="attributes">
-                <t groups="sale_blanket_order.blanket_orders_disable_adding_lines">
-                    <attribute name="create">blanket_order_id==False</attribute>
-                </t>
+            <xpath expr="//field[@name='order_line']" position="before">
+                <field name="disable_adding_lines" invisible="1" />
             </xpath>
         </field>
     </record>

odoo/addons/sale_blanket_order/wizard/create_sale_orders.py

@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 from collections import defaultdict
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 from odoo.tools import float_is_zero
 
@@ -22,7 +22,9 @@ class BlanketOrderWizard(models.TransientModel):
         )
         if blanket_order.state == "expired":
             raise UserError(
-                _("You can't create a sale order from " "an expired blanket order!")
+                self.env._(
+                    "You can't create a sale order from " "an expired blanket order!"
+                )
             )
         return blanket_order
 
@@ -37,16 +39,18 @@ class BlanketOrderWizard(models.TransientModel):
             float_is_zero(line.remaining_uom_qty, precision_digits=precision)
             for line in bo_lines
         ):
-            raise UserError(_("The sale has already been completed."))
+            raise UserError(self.env._("The sale has already been completed."))
 
         for line in bo_lines:
             if line.order_id.state != "open":
                 raise UserError(
-                    _("Sale Blanket Order %s is not open") % line.order_id.name
+                    self.env._("Sale Blanket Order %s is not open") % line.order_id.name
                 )
             line_company_id = line.company_id and line.company_id.id or False
             if company_id is not False and line_company_id != company_id:
-                raise UserError(_("You have to select lines " "from the same company."))
+                raise UserError(
+                    self.env._("You have to select lines " "from the same company.")
+                )
             else:
                 company_id = line_company_id
 
@@ -64,22 +68,17 @@ class BlanketOrderWizard(models.TransientModel):
         self._check_valid_blanket_order_line(bo_lines)
 
         lines = [
-            (
-                0,
-                0,
+            fields.Command.create(
                 {
+                    "analytic_distribution": bol.analytic_distribution,
                     "blanket_line_id": bol.id,
-                    "product_id": bol.product_id.id,
                     "date_schedule": bol.date_schedule,
-                    "remaining_uom_qty": bol.remaining_uom_qty,
-                    "price_unit": bol.price_unit,
-                    "product_uom": bol.product_uom,
                     "qty": bol.remaining_uom_qty,
-                    "partner_id": bol.partner_id,
                 },
             )
             for bol in bo_lines.filtered(
-                lambda l: not l.display_type and l.remaining_uom_qty != 0.0
+                lambda bo_line: not bo_line.display_type
+                and bo_line.remaining_uom_qty != 0.0
             )
         ]
         return lines
@@ -101,6 +100,7 @@ class BlanketOrderWizard(models.TransientModel):
 
     def _prepare_so_line_vals(self, line):
         return {
+            "analytic_distribution": line.analytic_distribution,
             "product_id": line.product_id.id,
             "name": line.product_id.name,
             "product_uom": line.product_uom.id,
@@ -108,7 +108,7 @@ class BlanketOrderWizard(models.TransientModel):
             "price_unit": line.blanket_line_id.price_unit,
             "blanket_order_line": line.blanket_line_id.id,
             "product_uom_qty": line.qty,
-            "tax_id": [(6, 0, line.taxes_id.ids)],
+            "tax_id": [fields.Command.set(line.taxes_id.ids)],
         }
 
     def _prepare_so_vals(
@@ -118,6 +118,8 @@ class BlanketOrderWizard(models.TransientModel):
         currency_id,
         pricelist_id,
         payment_term_id,
+        client_order_ref,
+        tag_ids,
         order_lines_by_customer,
     ):
         return {
@@ -128,47 +130,55 @@ class BlanketOrderWizard(models.TransientModel):
             "pricelist_id": pricelist_id,
             "payment_term_id": payment_term_id,
             "order_line": order_lines_by_customer[customer],
-            "analytic_account_id": self.blanket_order_id.analytic_account_id.id,
+            "client_order_ref": client_order_ref,
+            "tag_ids": [(6, 0, tag_ids.ids)] if tag_ids else False,
         }
 
+    @api.model
+    def _check_consistency(self, current_value, new_value):
+        if current_value == 0:
+            return new_value
+        return current_value if current_value == new_value else False
+
     def create_sale_order(self):
         order_lines_by_customer = defaultdict(list)
         currency_id = 0
         pricelist_id = 0
         user_id = 0
         payment_term_id = 0
-        for line in self.line_ids.filtered(lambda l: l.qty != 0.0):
+        client_order_ref = 0
+        tag_ids = 0
+        for line in self.line_ids.filtered(lambda line: line.qty != 0.0):
             if line.qty > line.remaining_uom_qty:
-                raise UserError(_("You can't order more than the remaining quantities"))
+                raise UserError(
+                    self.env._("You can't order more than the remaining quantities")
+                )
             vals = self._prepare_so_line_vals(line)
             order_lines_by_customer[line.partner_id.id].append((0, 0, vals))
 
-            if currency_id == 0:
-                currency_id = line.blanket_line_id.order_id.currency_id.id
-            elif currency_id != line.blanket_line_id.order_id.currency_id.id:
-                currency_id = False
-
-            if pricelist_id == 0:
-                pricelist_id = line.blanket_line_id.pricelist_id.id
-            elif pricelist_id != line.blanket_line_id.pricelist_id.id:
-                pricelist_id = False
-
-            if user_id == 0:
-                user_id = line.blanket_line_id.user_id.id
-            elif user_id != line.blanket_line_id.user_id.id:
-                user_id = False
-
-            if payment_term_id == 0:
-                payment_term_id = line.blanket_line_id.payment_term_id.id
-            elif payment_term_id != line.blanket_line_id.payment_term_id.id:
-                payment_term_id = False
+            currency_id = self._check_consistency(
+                currency_id, line.blanket_line_id.order_id.currency_id.id
+            )
+            pricelist_id = self._check_consistency(
+                pricelist_id, line.blanket_line_id.pricelist_id.id
+            )
+            user_id = self._check_consistency(user_id, line.blanket_line_id.user_id.id)
+            payment_term_id = self._check_consistency(
+                payment_term_id, line.blanket_line_id.payment_term_id.id
+            )
+            client_order_ref = self._check_consistency(
+                client_order_ref, line.blanket_line_id.order_id.client_order_ref
+            )
+            tag_ids = self._check_consistency(
+                tag_ids, line.blanket_line_id.order_id.tag_ids
+            )
 
         if not order_lines_by_customer:
-            raise UserError(_("An order can't be empty"))
+            raise UserError(self.env._("An order can't be empty"))
 
         if not currency_id:
             raise UserError(
-                _(
+                self.env._(
                     "Can not create Sale Order from Blanket "
                     "Order lines with different currencies"
                 )
@@ -182,15 +192,17 @@ class BlanketOrderWizard(models.TransientModel):
                 currency_id,
                 pricelist_id,
                 payment_term_id,
+                client_order_ref,
+                tag_ids,
                 order_lines_by_customer,
             )
             sale_order = self.env["sale.order"].create(order_vals)
             res.append(sale_order.id)
         return {
             "domain": [("id", "in", res)],
-            "name": _("Sales Orders"),
+            "name": self.env._("Sales Orders"),
             "view_type": "form",
-            "view_mode": "tree,form",
+            "view_mode": "list,form",
             "res_model": "sale.order",
             "context": {"from_sale_order": True},
             "type": "ir.actions.act_window",
@@ -198,11 +210,13 @@ class BlanketOrderWizard(models.TransientModel):
 
 
 class BlanketOrderWizardLine(models.TransientModel):
+    _inherit = "analytic.mixin"
     _name = "sale.blanket.order.wizard.line"
     _description = "Blanket order wizard line"
 
     wizard_id = fields.Many2one("sale.blanket.order.wizard")
     blanket_line_id = fields.Many2one("sale.blanket.order.line")
+    analytic_distribution = fields.Json(related="blanket_line_id.analytic_distribution")
     product_id = fields.Many2one(
         "product.product", related="blanket_line_id.product_id", string="Product"
     )
@@ -218,3 +232,6 @@ class BlanketOrderWizardLine(models.TransientModel):
         "res.partner", related="blanket_line_id.partner_id", string="Vendor"
     )
     taxes_id = fields.Many2many("account.tax", related="blanket_line_id.taxes_id")
+    company_id = fields.Many2one(
+        "res.company", related="blanket_line_id.company_id", string="Company"
+    )

odoo/addons/sale_blanket_order/wizard/create_sale_orders.xml

@@ -7,7 +7,7 @@
             <form string="Create Sale Order">
                 <group>
                     <field name="line_ids" nolabel="1" colspan="2">
-                        <tree create="false" editable="bottom">
+                        <list create="false" editable="bottom">
                             <field
                                 name="blanket_line_id"
                                 force_save="1"
@@ -20,7 +20,17 @@
                             <field name="remaining_uom_qty" />
                             <field name="product_uom" groups="uom.group_uom" />
                             <field name="qty" />
-                        </tree>
+                            <field
+                                name="analytic_distribution"
+                                widget="analytic_distribution"
+                                optional="hide"
+                                groups="analytic.group_analytic_accounting"
+                                options="{
+                                         'product_field': 'product_id',
+                                         'business_domain': 'sale_order'
+                                         }"
+                            />
+                        </list>
                     </field>
                 </group>
                 <footer>