From 2f02cef4b062e26751ebebc8574e5dc72261a423 Mon Sep 17 00:00:00 2001
From: gjacobjn <52928254+gjacobjn@users.noreply.github.com>
Date: Thu, 6 Feb 2020 10:48:16 +0100
Subject: [PATCH 1/3] Update Edit.php

---
 lib/Alchemy/Phrasea/Helper/User/Edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Helper/User/Edit.php b/lib/Alchemy/Phrasea/Helper/User/Edit.php
index 5c760a55de..2c7513fb3f 100644
--- a/lib/Alchemy/Phrasea/Helper/User/Edit.php
+++ b/lib/Alchemy/Phrasea/Helper/User/Edit.php
@@ -657,8 +657,8 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
             ->setEmail($parm['email'])
             ->setAddress($parm['address'])
             ->setZipCode($parm['zip'])
-            ->setActivity($parm['function'])
-            ->setJob($parm['activite'])
+            ->setActivity($parm['activite'])
+            ->setJob($parm['function'])
             ->setCompany($parm['company'])
             ->setPhone($parm['telephone'])
             ->setFax($parm['fax']);

From 3c1c6c41f5ec3e6114fe24b891094e5f8a82e255 Mon Sep 17 00:00:00 2001
From: gjacobjn <52928254+gjacobjn@users.noreply.github.com>
Date: Thu, 6 Feb 2020 14:17:51 +0100
Subject: [PATCH 2/3] Fix in template

---
 templates/web/account/account.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/web/account/account.html.twig b/templates/web/account/account.html.twig
index 887b29ec03..8dea3e8726 100644
--- a/templates/web/account/account.html.twig
+++ b/templates/web/account/account.html.twig
@@ -107,7 +107,7 @@
                             <div class="control-group">
                                 <label class="form_label control-label" for="form_function"><strong>{{ "admin::compte-utilisateur poste" | trans }}</strong></label>
                                 <div class="controls">
-                                    <input class="input_element input-xlarge" type="text" name="form_function" id="form_function" value="{{ app["authentication"].getUser().getActivity() }}" />
+                                    <input class="input_element input-xlarge" type="text" name="form_function" id="form_function" value="{{ app["authentication"].getUser().getJob() }}" />
                                     <p class="form_alert help-block"></p>
                                 </div>
                             </div>
@@ -121,7 +121,7 @@
                             <div class="control-group">
                                 <label class="form_label control-label" for="form_activity"><strong>{{ "admin::compte-utilisateur activite" | trans }}</strong></label>
                                 <div class="controls">
-                                    <input class="input_element input-xlarge" type="text" name="form_activity" id="form_activity" value="{{ app["authentication"].getUser().getJob() }}" />
+                                    <input class="input_element input-xlarge" type="text" name="form_activity" id="form_activity" value="{{ app["authentication"].getUser().getActivity() }}" />
                                     <p class="form_alert help-block"></p>
                                 </div>
                             </div>

From b18ef096615056190e9ce2c0f40c54715aa6928e Mon Sep 17 00:00:00 2001
From: gjacobjn <52928254+gjacobjn@users.noreply.github.com>
Date: Fri, 7 Feb 2020 17:17:54 +0100
Subject: [PATCH 3/3] Update AccountController.php

---
 lib/Alchemy/Phrasea/Controller/Root/AccountController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Alchemy/Phrasea/Controller/Root/AccountController.php b/lib/Alchemy/Phrasea/Controller/Root/AccountController.php
index b4053a6ce1..6bf2d11f17 100644
--- a/lib/Alchemy/Phrasea/Controller/Root/AccountController.php
+++ b/lib/Alchemy/Phrasea/Controller/Root/AccountController.php
@@ -458,9 +458,9 @@ class AccountController extends Controller
                 ->setZipCode($request->request->get("form_zip"))
                 ->setPhone($request->request->get("form_phone"))
                 ->setFax($request->request->get("form_fax"))
-                ->setJob($request->request->get("form_activity"))
+                ->setJob($request->request->get("form_function"))
                 ->setCompany($request->request->get("form_company"))
-                ->setPosition($request->request->get("form_function"))
+                ->setPosition($request->request->get("form_activity"))
                 ->setNotifications((Boolean) $request->request->get("mail_notifications"));
 
             $service->updateAccount($command);