diff --git a/helpdesk_morsa/controllers/portal.py b/helpdesk_morsa/controllers/portal.py index cece887..78e9063 100644 --- a/helpdesk_morsa/controllers/portal.py +++ b/helpdesk_morsa/controllers/portal.py @@ -1040,7 +1040,7 @@ class PortalHelpdeskMorsa(PortalHelpdesk): ticket_id.attachment_ids = [(6, 0, attachment_ids)] - return werkzeug.utils.redirect("/my/soporte?ctr=False") + return request.redirect("/my/soporte?ctr=False") except Exception as e: _logger.exception('Something went wrong %s',str(e)) @@ -1155,7 +1155,7 @@ class PortalHelpdeskMorsa(PortalHelpdesk): }) attachment_ids.append(attachment_id.id) ticket_id.attachment_ids = [(6, 0, attachment_ids)] - return werkzeug.utils.redirect("/my/erp?ctr=False") + return request.redirect("/my/erp?ctr=False") except Exception as e: _logger.exception('Something went wrong %s',str(e)) @@ -1234,7 +1234,7 @@ class PortalHelpdeskMorsa(PortalHelpdesk): }) attachment_ids.append(attachment_id.id) ticket_id.attachment_ids = [(6, 0, attachment_ids)] - return werkzeug.utils.redirect("/my/911?ctr=False") + return request.redirect("/my/911?ctr=False") except Exception as e: _logger.exception('Something went wrong %s',str(e)) diff --git a/helpdesk_morsa/models/helpdesk_ticket.py b/helpdesk_morsa/models/helpdesk_ticket.py index 48eb382..4bf57c4 100644 --- a/helpdesk_morsa/models/helpdesk_ticket.py +++ b/helpdesk_morsa/models/helpdesk_ticket.py @@ -320,8 +320,8 @@ class HelpdeskTicket(models.Model): def append_sla_policies(self): sla = self.env['sh.helpdesk.sla'].search([ ('sh_team_id','=',self.team_id.id), - ('sh_ticket_type_id','=',self.ticket_type.id) - ('sh_sla_target_type','=','reaching_stage') + ('sh_ticket_type_id','=',self.ticket_type.id), + ('sh_sla_target_type','=','reaching_stage'), ('sh_stage_id','!=',self.stage_id.id) ]).ids if sla: diff --git a/helpdesk_morsa/static/img/morsa.png b/helpdesk_morsa/static/img/morsa.png deleted file mode 100644 index adc8f99..0000000 Binary files a/helpdesk_morsa/static/img/morsa.png and /dev/null differ diff --git a/helpdesk_morsa/static/img/morsa_logo_white.png b/helpdesk_morsa/static/img/morsa_logo_white.png new file mode 100644 index 0000000..e5eaec5 Binary files /dev/null and b/helpdesk_morsa/static/img/morsa_logo_white.png differ diff --git a/helpdesk_morsa/views/portal/portal_tickets_emergency.xml b/helpdesk_morsa/views/portal/portal_tickets_emergency.xml index d810122..b719fea 100644 --- a/helpdesk_morsa/views/portal/portal_tickets_emergency.xml +++ b/helpdesk_morsa/views/portal/portal_tickets_emergency.xml @@ -6,12 +6,8 @@ <t t-call="portal.portal_searchbar"> <t t-set="title">TI 911</t> - <div class="form-inline ml-lg-4"> - <a id="new_request" class="btn btn-secondary btn-sm" style="color:#FFFFFF" name="new_request" title="Create Support Request" aria-label="Create Support Request" role="button"><i class="fa fa-plus" />Crear Ticket</a> - </div> - <input type="hidden" name="mdl_shw" id="mdl_shw" t-att-value="created"/> </t> - + <input type="hidden" name="mdl_shw" id="mdl_shw" t-att-value="created"/> <div id="createticketModal" class="modal fade" role="dialog"> <div class="modal-dialog"> <div class="modal-content"> diff --git a/helpdesk_morsa/views/portal/portal_tickets_erp.xml b/helpdesk_morsa/views/portal/portal_tickets_erp.xml index 6c4de67..8a1ae6a 100644 --- a/helpdesk_morsa/views/portal/portal_tickets_erp.xml +++ b/helpdesk_morsa/views/portal/portal_tickets_erp.xml @@ -7,12 +7,8 @@ <t t-call="portal.portal_searchbar"> <t t-set="title">Asistencia ERP</t> - <div class="form-inline ml-lg-4"> - <a id="new_request" class="btn btn-secondary btn-sm" style="color:#FFFFFF" name="new_request" title="Create Support Request" aria-label="Create Support Request" role="button" ><i class="fa fa-plus" />Crear Ticket</a> - </div> - <input type="hidden" name="mdl_shw" id="mdl_shw" t-att-value="created"/> </t> - + <input type="hidden" name="mdl_shw" id="mdl_shw" t-att-value="created"/> <div id="createticketModal" class="modal fade" role="dialog"> <div class="modal-dialog"> <div class="modal-content">