FIX comments and '_'

Author: TB-Ph35

fieldservice_survey/controllers/main.py

@@ -1,7 +1,7 @@
 # Copyright 2023 - TODAY, Marcel Savegnago <[email protected]>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, http
+from odoo import http
 from odoo.exceptions import AccessDenied
 from odoo.http import request
 from odoo.osv import expression
@@ -26,7 +26,7 @@ def _get_user_input_domain(self, survey, line_filter_domain, **post):
         try:
             fsm_order = request.env["fsm.order"].sudo().browse(int(fsm_order_id))
         except ValueError:
-            raise AccessDenied(_("Invalid FSM Order ID")) from None
+            raise AccessDenied(request.env._("Invalid FSM Order ID")) from None
 
         user = request.env.user
         partner = user.partner_id
@@ -46,7 +46,9 @@ def _get_user_input_domain(self, survey, line_filter_domain, **post):
                 user_input_domain,
             )
 
-        raise AccessDenied(_("You do not have access to this FSM Order Survey"))
+        raise AccessDenied(
+            request.env._("You do not have access to this FSM Order Survey")
+        )
 
     @http.route(
         "/fsm_order/<int:fsm_order_id>/results", type="http", auth="user", website=True
@@ -55,7 +57,7 @@ def survey_results(self, fsm_order_id, **post):
         try:
             fsm_order = request.env["fsm.order"].sudo().browse(fsm_order_id)
         except ValueError:
-            raise AccessDenied(_("Invalid FSM Order ID")) from None
+            raise AccessDenied(request.env._("Invalid FSM Order ID")) from None
 
         if (
             fsm_order.person_id.partner_id == request.env.user.partner_id
@@ -105,7 +107,7 @@ def survey_results(self, fsm_order_id, **post):
             survey_sudo = answer.survey_id
 
         if not survey_sudo:
-            raise AccessDenied(_("No survey found for the given FSM Order"))
+            raise AccessDenied(request.env._("No survey found for the given FSM Order"))
 
         post["fsm_order_id"] = fsm_order_id
         user_input_lines_sudo, search_filters = self._extract_filters_data(

fieldservice_survey/views/res_config_settings.xml

@@ -19,37 +19,7 @@
                         name="fsm_order_survey_template_id"
                         invisible="module_fieldservice_survey  == False"
                     />
-                    <!-- widget="many2many_tags" /> -->
                 </setting>
-                <!-- <div -->
-                <!--     name="module_fieldservice_survey" -->
-                <!--     class="col-xs-12 col-md-6 o_setting_box" -->
-                <!-- > -->
-                <!--     <div class="o_setting_left_pane"> -->
-                <!--         <field name="module_fieldservice_survey" /> -->
-                <!--     </div> -->
-                <!--     <div class="o_setting_right_pane"> -->
-                <!--         <label -->
-                <!--             for="module_fieldservice_survey" -->
-                <!--             string="Enable feedback request through surveys" -->
-                <!--         /> -->
-                <!--         <div class="text-muted"> -->
-                <!--             Enable feedback request through surveys -->
-                <!--         </div> -->
-                <!--         <div -->
-                <!--             class="content-group" -->
-                <!--             invisible="module_fieldservice_survey == False" -->
-                <!--         > -->
-                <!--             <div class="row mt16"> -->
-                <!--                 <label -->
-                <!--                     for="fsm_order_survey_template_id" -->
-                <!--                     class="col-lg-3 o_light_label" -->
-                <!--                 /> -->
-                <!--                 <field name="fsm_order_survey_template_id" /> -->
-                <!--             </div> -->
-                <!--         </div> -->
-                <!--     </div> -->
-                <!-- </div> -->
             </xpath>
         </field>
     </record>

fieldservice_survey/wizard/fsm_order_survey_submit.py

@@ -2,7 +2,7 @@
 
 from dateutil.relativedelta import relativedelta
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError
 
 _logger = logging.getLogger(__name__)
@@ -83,7 +83,7 @@ def default_get(self, fields_list):
         """Override default_get to add custom defaults."""
         if not self.env.user.email:
             raise UserError(
-                _(
+                self.env._(
                     "Unable to post message,"
                     "please configure the sender's email address."
                 )
@@ -236,8 +236,8 @@ def action_send(self):
             ).activity_schedule(
                 "mail.mail_activity_data_todo",
                 self.deadline,
-                summary=_("Fill the answer form on survey"),
-                note=_(
+                summary=self.env_("Fill the answer form on survey"),
+                note=self.env._(
                     "An survey was requested. Please take time to fill "
                     'the <a href="%s" target="_blank">survey</a>'
                 )