[17.0][MIG] sale_order_type: Migration to 17.0

Author: matiasperalta1

sale_order_type/__manifest__.py

@@ -8,7 +8,7 @@
 
 {
     "name": "Sale Order Type",
-    "version": "16.0.1.1.0",
+    "version": "17.0.1.0.0",
     "category": "Sales Management",
     "author": "Grupo Vermon,"
     "AvanzOSC,"

sale_order_type/models/account_move.py

@@ -12,8 +12,7 @@ class AccountMove(models.Model):
         string="Sale Type",
         compute="_compute_sale_type_id",
         store=True,
-        readonly=True,
-        states={"draft": [("readonly", False)]},
+        readonly=False,
         ondelete="restrict",
         copy=True,
         precompute=True,

sale_order_type/models/sale.py

@@ -16,12 +16,6 @@ class SaleOrder(models.Model):
         compute="_compute_sale_type_id",
         precompute=True,
         store=True,
-        readonly=False,
-        states={
-            "sale": [("readonly", True)],
-            "done": [("readonly", True)],
-            "cancel": [("readonly", True)],
-        },
         ondelete="restrict",
         copy=True,
         check_company=True,
@@ -182,14 +176,14 @@ def write(self, vals):
                         new_vals["name"] = sale_type.sequence_id.next_by_id(
                             sequence_date=vals.get("date_order")
                         )
-                        super(SaleOrder, record).write(new_vals)
+                        super().write(new_vals)
                     else:
-                        super(SaleOrder, record).write(vals)
+                        super().write(vals)
                 return True
         return super().write(vals)
 
     def _prepare_invoice(self):
-        res = super(SaleOrder, self)._prepare_invoice()
+        res = super()._prepare_invoice()
         if self.type_id.journal_id:
             res["journal_id"] = self.type_id.journal_id.id
         if self.type_id:

sale_order_type/reports/account_invoice_report_view.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_account_invoice_report_search" model="ir.ui.view">

sale_order_type/reports/sale_report_view.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
     <record id="view_order_product_search" model="ir.ui.view">

sale_order_type/tests/test_sale_order_type.py

@@ -11,7 +11,7 @@
 
 class TestSaleOrderType(common.TransactionCase):
     def setUp(self):
-        super(TestSaleOrderType, self).setUp()
+        super().setUp()
         self.sale_type_model = self.env["sale.order.type"]
         self.sale_order_model = self.env["sale.order"]
         self.invoice_model = self.env["account.move"].with_context(
@@ -53,7 +53,9 @@ def setUp(self):
             {"type": "service", "invoice_policy": "order", "name": "Test product"}
         )
         self.immediate_payment = self.env.ref("account.account_payment_term_immediate")
-        self.sale_pricelist = self.env.ref("product.list0")
+        self.sale_pricelist = self.env["product.pricelist"].create(
+            {"name": "Public Pricelist", "sequence": 1}
+        )
         self.free_carrier = self.env.ref("account.incoterm_FCA")
         self.sale_type = self.sale_type_model.create(
             {

sale_order_type/views/account_move_views.xml

@@ -7,11 +7,12 @@
             <label for="journal_id" position="before">
                 <field
                     name="sale_type_id"
-                    attrs="{'invisible': [('move_type', 'not in', ['out_invoice', 'out_refund'])]}"
+                    invisible="move_type not in ['out_invoice', 'out_refund']"
+                    readonly="state != 'draft'"
                 />
             </label>
             <xpath expr="//notebook//tree//field[@name='sequence']" position="before">
-                <field name="account_id" invisible="1" />
+                <field name="account_id" column_invisible="True" />
             </xpath>
         </field>
     </record>

sale_order_type/views/sale_order_type_view.xml

@@ -11,7 +11,7 @@
                         name="web_ribbon"
                         title="Archived"
                         bg_color="bg-danger"
-                        attrs="{'invisible': [('active', '=', True)]}"
+                        invisible="active"
                     />
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only" />
@@ -34,7 +34,7 @@
                             />
                             <field
                                 name="route_id"
-                                attrs="{'invisible': [('warehouse_id', '=', False)]}"
+                                invisible="not warehouse_id"
                                 groups="stock.group_adv_location"
                             />
                             <field name="sequence_id" />
@@ -52,10 +52,7 @@
                                 name="pricelist_id"
                                 groups="product.group_product_pricelist"
                             />
-                            <field
-                                name="incoterm_id"
-                                groups="sale_stock.group_display_incoterm"
-                            />
+                            <field name="incoterm_id" />
                         </group>
                     </group>
                     <group>
@@ -81,7 +78,7 @@
                 <field name="picking_policy" />
                 <field name="payment_term_id" />
                 <field name="pricelist_id" groups="product.group_product_pricelist" />
-                <field name="incoterm_id" groups="sale_stock.group_display_incoterm" />
+                <field name="incoterm_id" />
                 <field name="company_id" groups="base.group_multi_company" />
                 <field name="description" />
             </tree>
@@ -103,7 +100,7 @@
                 <field name="picking_policy" />
                 <field name="payment_term_id" />
                 <field name="pricelist_id" groups="product.group_product_pricelist" />
-                <field name="incoterm_id" groups="sale_stock.group_display_incoterm" />
+                <field name="incoterm_id" />
                 <field name="company_id" groups="base.group_multi_company" />
                 <group expand="0" string="Group By">
                     <filter
@@ -149,7 +146,6 @@
                         string="Incoterm"
                         domain="[]"
                         context="{'group_by':'incoterm_id'}"
-                        groups="sale_stock.group_display_incoterm"
                     />
                 </group>
             </search>

sale_order_type/views/sale_order_view.xml

@@ -5,7 +5,11 @@
         <field name="inherit_id" ref="sale.view_order_form" />
         <field name="arch" type="xml">
             <field name="currency_id" position="after">
-                <field name="type_id" required="1" />
+                <field
+                    name="type_id"
+                    required="1"
+                    readonly="state in ['sale', 'cancel'] or locked"
+                />
             </field>
         </field>
     </record>

sale_order_type/wizards/sale_make_invoice_advance.py

@@ -8,7 +8,7 @@ class SaleAdvancePaymentInv(models.TransientModel):
     _inherit = "sale.advance.payment.inv"
 
     def _prepare_invoice_values(self, order, so_line):
-        res = super(SaleAdvancePaymentInv, self)._prepare_invoice_values(order, so_line)
+        res = super()._prepare_invoice_values(order, so_line)
         if order.type_id.journal_id:
             res["journal_id"] = order.type_id.journal_id.id
         if order.type_id: