diff --git a/agreement/models/res_config_settings.py b/agreement/models/res_config_settings.py
index 1c1b05a2..b81b2945 100644
--- a/agreement/models/res_config_settings.py
+++ b/agreement/models/res_config_settings.py
@@ -8,12 +8,20 @@ class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
     module_agreement_maintenance = fields.Boolean(
-        string='Manage maintenance agreements and contracts')
+        string='Manage maintenance agreements and contracts.')
     module_agreement_mrp = fields.Boolean(
         string='Link your manufacturing orders to an agreement.')
     module_agreement_project = fields.Boolean(
         string='Link your projects and tasks to an agreement.')
     module_agreement_repair = fields.Boolean(
         string='Link your repair orders to an agreement.')
+    module_agreement_rma = fields.Boolean(
+        string='Link your RMAs to an agreement.')
     module_agreement_stock = fields.Boolean(
         string='Link your pickings to an agreement.')
+    module_fieldservice_agreement = fields.Boolean(
+        string='Link your Field Service orders to an agreement.')
+    module_fieldservice_equipment_agreement = fields.Boolean(
+        string='Link your Field Service equipments to an agreement.')
+    module_helpdesk_agreement = fields.Boolean(
+        string='Link your Helpdesk tickets to an agreement.')
diff --git a/agreement/views/res_config_settings.xml b/agreement/views/res_config_settings.xml
index 80520df6..56728112 100644
--- a/agreement/views/res_config_settings.xml
+++ b/agreement/views/res_config_settings.xml
@@ -34,6 +34,28 @@
                     </div>
                     <h2>Advanced Features</h2>
                     <div class="row mt16 o_settings_container">
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_fieldservice_agreement"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label string="Field Service"/>
+                                <div class="text-muted">
+                                    Link your Field Service orders to an agreement
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_fieldservice_equipment_agreement"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label string="Field Service Equipments"/>
+                                <div class="text-muted">
+                                    Link your Field Service equipments to an agreement
+                                </div>
+                            </div>
+                        </div>
                         <div class="col-xs-12 col-md-6 o_setting_box">
                             <div class="o_setting_left_pane">
                                 <field name="module_agreement_stock"/>
@@ -41,7 +63,18 @@
                             <div class="o_setting_right_pane">
                                 <label string="Inventory"/>
                                 <div class="text-muted">
-                                    Link your pickings to an agreement
+                                    Link your transfers to an agreement
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_agreement_rma"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label string="Returns"/>
+                                <div class="text-muted">
+                                    Link your returns to an agreement
                                 </div>
                             </div>
                         </div>
@@ -89,6 +122,17 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="module_heldesk_agreement"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label string="Helpdesk"/>
+                                <div class="text-muted">
+                                    Link your Helpdesk tickets to an agreement
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </xpath>