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

[17.0][MIG] helpdesk_mgmt_fieldservice #652

Open
wants to merge 19 commits into
base: 17.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 1 addition & 0 deletions helpdesk_mgmt_fieldservice/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ Contributors
- Open Source Integrators <[email protected]>
- Serpent Consulting Services Pvt. Ltd. <[email protected]>
- Marcel Savegnago <[email protected]>
- Italo Lopes <[email protected]>

Maintainers
-----------
Expand Down
2 changes: 1 addition & 1 deletion helpdesk_mgmt_fieldservice/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"name": "Helpdesk Mgmt Fieldservice",
"summary": """
Create service orders from a ticket""",
"version": "16.0.1.0.0",
"version": "17.0.1.0.0",
"license": "AGPL-3",
"author": "Open Source Integrators, "
"Escodoo, "
Expand Down
2 changes: 1 addition & 1 deletion helpdesk_mgmt_fieldservice/models/fsm_location.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def action_view_ticket(self):
action["context"] = {}
if len(ticket_ids) == 1:
action["views"] = [
(self.env.ref("helpdesk_mgmt.ticket_view_form").id, "form")
(self.env.ref("helpdesk_mgmt.helpdesk_ticket_view_form").id, "form")
]
action["res_id"] = ticket_ids.ids[0]
else:
Expand Down
4 changes: 2 additions & 2 deletions helpdesk_mgmt_fieldservice/models/res_partner.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ def action_view_helpdesk_tickets(self):
) and self.env.user.has_group("helpdesk_mgmt.group_helpdesk_user_own"):
context = dict(self.env.context)
context.pop("search_default_open", None)
self = self.with_context(
context_self = self.with_context(

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is useless. I would instead just clean the super call as self will be updated with context anyway:
return super().action_view_helpdesk_tickets()
So we need only one return statement in the end

context,
default_partner_id=self.id,
default_fsm_location_id=self.service_location_id.id,
)
return super(ResPartner, self).action_view_helpdesk_tickets()
return super(ResPartner, context_self).action_view_helpdesk_tickets()
return super().action_view_helpdesk_tickets
1 change: 1 addition & 0 deletions helpdesk_mgmt_fieldservice/readme/CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
- Open Source Integrators \<<[email protected]>\>
- Serpent Consulting Services Pvt. Ltd. \<<[email protected]>\>
- Marcel Savegnago \<<[email protected]>\>
- Italo Lopes \<<[email protected]>\>
1 change: 1 addition & 0 deletions helpdesk_mgmt_fieldservice/static/description/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ <h2><a class="toc-backref" href="#toc-entry-10">Contributors</a></h2>
<li>Open Source Integrators &lt;<a class="reference external" href="mailto:contact&#64;opensourceintegrators.com">contact&#64;opensourceintegrators.com</a>&gt;</li>
<li>Serpent Consulting Services Pvt. Ltd. &lt;<a class="reference external" href="mailto:support&#64;serpentcs.com">support&#64;serpentcs.com</a>&gt;</li>
<li>Marcel Savegnago &lt;<a class="reference external" href="mailto:marcel.savegnago&#64;escodoo.com.br">marcel.savegnago&#64;escodoo.com.br</a>&gt;</li>
<li>Italo Lopes &lt;<a class="reference external" href="mailto:italo.lopes&#64;camptocamp.com">italo.lopes&#64;camptocamp.com</a>&gt;</li>
</ul>
</div>
<div class="section" id="maintainers">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def test_helpdesk_ticket_fsm_order(self):
action_view_ticket = self.test_location.action_view_ticket()
self.assertEqual(
action_view_ticket["views"],
[(self.env.ref("helpdesk_mgmt.ticket_view_form").id, "form")],
[(self.env.ref("helpdesk_mgmt.helpdesk_ticket_view_form").id, "form")],
)
self.assertEqual(action_view_ticket["res_id"], self.ticket_1.id)
# checking action_complete on fsm.order with ticket
Expand Down
49 changes: 22 additions & 27 deletions helpdesk_mgmt_fieldservice/views/helpdesk_ticket_views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,46 +8,43 @@
<record id="helpdesk_ticket_view_service_request_form" model="ir.ui.view">
<field name="name">helpdesk.ticket.service.request.form</field>
<field name="model">helpdesk.ticket</field>
<field name="inherit_id" ref="helpdesk_mgmt.ticket_view_form" />
<field name="inherit_id" ref="helpdesk_mgmt.helpdesk_ticket_view_form" />
<field name="arch" type="xml">
<page name="other_info" position="after">
<page string="Service Orders">
<button
<page string="Service Orders">
<button
name="action_create_order"
string="Create FSM Order"
type="object"
class="btn btn-primary mb8"
/>
<field name="fsm_order_ids">
<tree create="false">
<field name="name" style="pointer-events:none;" />
<field
name="location_id"
style="pointer-events:none;"
/>
<field name="stage_id" style="pointer-events:none;" />
<field name="person_id" style="pointer-events:none;" />
<field
<field name="fsm_order_ids">
<tree create="false">
<field name="name" style="pointer-events:none;" />
<field name="location_id" style="pointer-events:none;" />
<field name="stage_id" style="pointer-events:none;" />
<field name="person_id" style="pointer-events:none;" />
<field
name="scheduled_date_start"
style="pointer-events:none;"
/>
<field
<field
name="scheduled_date_end"
style="pointer-events:none;"
/>
<field
<field
name="scheduled_duration"
style="pointer-events:none;"
/>
<button
<button
name="action_view_order"
string="Open"
type="object"
class="helpdesk_column"
/>
</tree>
</field>
</page>
</tree>
</field>
</page>
</page>
<field name="partner_id" position="before">
<field name="partner_domain" invisible="1" />
Expand All @@ -58,7 +55,8 @@
<field name="partner_id" position="attributes">
<attribute
name="domain"
>['|', ('service_location_id', '=', partner_domain), (all_partners, '=', True)]</attribute>
>['|', ('service_location_id', '=', partner_domain), (all_partners, '=', True)]
</attribute>
</field>
</field>
</record>
Expand All @@ -81,17 +79,14 @@
<record id="helpdesk_ticket_view_form_logic" model="ir.ui.view">
<field name="name">helpdesk.ticket.service.form.logic</field>
<field name="model">helpdesk.ticket</field>
<field name="inherit_id" ref="helpdesk_mgmt.ticket_view_form" />
<field name="inherit_id" ref="helpdesk_mgmt.helpdesk_ticket_view_form" />
<field name="priority">99</field>
<field name="arch" type="xml">
<field name="partner_name" position="attributes">
<attribute name="invisible">1</attribute>
</field>
<field name="partner_email" position="replace">
<field
name="partner_email"
attrs="{'invisible': [('partner_id','=',False)]}"
/>
<field name="partner_email" position="attributes">
<attribute name="invisible">not partner_id</attribute>
</field>
<field name="description" position="replace">
<group string="Description" name="description_grp">
Expand All @@ -107,7 +102,7 @@
<record id="helpdesk_ticket_tree_view_location" model="ir.ui.view">
<field name="name">helpdesk.ticket.tree.location</field>
<field name="model">helpdesk.ticket</field>
<field name="inherit_id" ref="helpdesk_mgmt.ticket_view_tree" />
<field name="inherit_id" ref="helpdesk_mgmt.helpdesk_ticket_view_tree" />
<field name="arch" type="xml">
<field name="partner_name" position="after">
<field name="fsm_location_id" />
Expand Down