diff --git a/.theia/launch.json b/.theia/launch.json
index fde9fce0..b76ea3b2 100644
--- a/.theia/launch.json
+++ b/.theia/launch.json
@@ -28,6 +28,26 @@
                      "--test-enable", "--no-xmlrpc", "--stop-after-init"],
             "console": "integratedTerminal"
         },
+        {
+            "name": "Odoo: INIT 'hr_commission'",
+            "type": "python",
+            "request": "launch",
+            "program": "/opt/odoo/hibou-suite/odoo-run.py",
+            "args": ["-i", "hr_commission", 
+                     "-u", "hr_commission",
+                     "--stop-after-init"],
+            "console": "integratedTerminal"
+        },
+        {
+            "name": "Odoo: TEST 'hr_commission'",
+            "type": "python",
+            "request": "launch",
+            "program": "/opt/odoo/hibou-suite/odoo-run.py",
+            "args": ["-i", "hr_commission", 
+                     "-u", "hr_commission",
+                     "--test-enable", "--no-xmlrpc", "--stop-after-init"],
+            "console": "integratedTerminal"
+        },
         {
             "name": "Odoo: INIT 'hr_payroll_hibou'",
             "type": "python",
diff --git a/hr_commission/tests/test_commission.py b/hr_commission/tests/test_commission.py
index 3ee6192e..1d15ef70 100644
--- a/hr_commission/tests/test_commission.py
+++ b/hr_commission/tests/test_commission.py
@@ -114,7 +114,7 @@ class TestCommission(common.TransactionCase):
         receivable_line = payment.move_id.line_ids.filtered('credit')
 
         inv.js_assign_outstanding_line(receivable_line.id)
-        self.assertEqual(inv.payment_state, 'in_payment', 'Invoice is not paid.')
+        self.assertEqual(inv.payment_state, 'paid', 'Invoice is not paid.')
 
         user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id)
         self.assertEqual(user_commission.state, 'done', 'Commission is not done.')
@@ -274,7 +274,7 @@ class TestCommission(common.TransactionCase):
         receivable_line = payment.move_id.line_ids.filtered('credit')
 
         inv.js_assign_outstanding_line(receivable_line.id)
-        self.assertEqual(inv.payment_state, 'in_payment', 'Invoice is not paid.')
+        self.assertEqual(inv.payment_state, 'paid', 'Invoice is not paid.')
 
         user_commission = inv.commission_ids.filtered(lambda c: c.employee_id.id == emp.id)
         self.assertEqual(user_commission.state, 'done', 'Commission is not done.')
diff --git a/hr_commission/views/res_config_settings_views.xml b/hr_commission/views/res_config_settings_views.xml
index 645c8f06..ccb41ddd 100644
--- a/hr_commission/views/res_config_settings_views.xml
+++ b/hr_commission/views/res_config_settings_views.xml
@@ -7,9 +7,9 @@
         <field name="priority" eval="50"/>
         <field name="inherit_id" ref="account.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='invoicing_settings']" position="after">
+            <xpath expr="//div[hasclass('settings')]" position="inside">
                 <h2>Commissions</h2>
-                <div class="row mt16 o_settings_container" id="commission_settings" groups="account.group_account_user">
+                <div class="row mt16 o_settings_container" id="commission_settings" groups="account.group_account_manager">
                     <div class="col-xs-12 col-md-6 o_setting_box" title="These taxes are set in any new product created.">
                         <div class="o_setting_left_pane"/>
                         <div class="o_setting_right_pane">