[FIX] fieldservice_sale migration changes

Author: RLeeOSI

fieldservice_sale/__manifest__.py

@@ -10,10 +10,10 @@
     "depends": ["fieldservice", "sale_management", "fieldservice_account"],
     "data": [
         "security/ir.model.access.csv",
-        "views/fsm_branch.xml",
         "views/fsm_location.xml",
         "views/fsm_order.xml",
         "views/product_template.xml",
+        "views/res_branch.xml",
         "views/sale_order.xml",
         "views/res_config_settings.xml",
     ],

fieldservice_sale/models/__init__.py

@@ -2,10 +2,10 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 from . import (
-    fsm_branch,
     fsm_location,
     fsm_order,
     product_template,
+    res_branch,
     sale_order_line,
     sale_order,
 )

fieldservice_sale/models/fsm_location.py

@@ -6,4 +6,4 @@
 class FSMLocation(models.Model):
     _inherit = "fsm.location"
 
-    sales_territory_id = fields.Many2one("fsm.territory", string="Sales Territory")
+    sales_territory_id = fields.Many2one("res.territory", string="Sales Territory")

fieldservice_sale/models/fsm_branch.py fieldservice_sale/models/res_branch.py

@@ -3,8 +3,8 @@
 from odoo import fields, models
 
 
-class FSMBranch(models.Model):
-    _inherit = "fsm.branch"
+class ResBranch(models.Model):
+    _inherit = "res.branch"
 
     pricelist_id = fields.Many2one(
         "product.pricelist",

fieldservice_sale/readme/CONTRIBUTORS.rst

@@ -3,6 +3,7 @@
   * Steve Campbell <[email protected]>
   * Maxime Chambreuil <[email protected]>
   * Wolfgang Hall <[email protected]>
+  * Raphael Lee <[email protected]>
 
 * Serpent Consulting Services Pvt. Ltd. <[email protected]>
 * Brian McMaster <[email protected]>

fieldservice_sale/views/fsm_branch.xml

@@ -0,0 +1,12 @@
+<odoo>
+    <record id="res_branch_form_view_pricelist" model="ir.ui.view">
+        <field name="name">res.branch.form.pricelist</field>
+        <field name="model">res.branch</field>
+        <field name="inherit_id" ref="base_territory.res_branch_form_view" />
+        <field name="arch" type="xml">
+            <field name="partner_id" position="after">
+                <field name="pricelist_id" groups="product.group_sale_pricelist" />
+            </field>
+        </field>
+    </record>
+</odoo>

fieldservice_sale/views/res_branch.xml

@@ -3,9 +3,6 @@
         <field name="group_fsm_template" eval="1" />
     </record>
     <function model="res.config.settings" name="execute">
-        <!-- ids = -->
         <value eval="[ref('fieldservice_sale.res_config_settings_fsm_template')]" />
-        <!-- context = -->
-        <value eval="{}" />
     </function>
 </odoo>