Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] fieldservice_sale migration changes #13

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fieldservice_sale/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
Expand Down
2 changes: 1 addition & 1 deletion fieldservice_sale/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
2 changes: 1 addition & 1 deletion fieldservice_sale/models/fsm_location.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions fieldservice_sale/readme/CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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]>
Expand Down
12 changes: 0 additions & 12 deletions fieldservice_sale/views/fsm_branch.xml

This file was deleted.

12 changes: 12 additions & 0 deletions fieldservice_sale/views/res_branch.xml
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 0 additions & 3 deletions fieldservice_sale/views/res_config_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>