From dacd7227bc81ef31132bb283c7b17ca5ee579902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Nov 2019 20:23:21 +0100
Subject: [PATCH 1/4] replace societe_id by socid

---
 htdocs/salaries/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 02a729cb16c..51fd8462180 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -226,7 +226,7 @@ if ($result)
         $userstatic->admin=$obj->admin;
         $userstatic->login=$obj->login;
         $userstatic->email=$obj->email;
-        $userstatic->societe_id=$obj->fk_soc;
+        $userstatic->socid=$obj->fk_soc;
         $userstatic->statut=$obj->status;
 
         $salstatic->id=$obj->rowid;

From 1c8e9fffbee892ca39d07f605ee1afb4d55b9a97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Nov 2019 20:26:52 +0100
Subject: [PATCH 2/4] Update payout.php

---
 htdocs/stripe/payout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index e2f19c560be..89c2f1a237c 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -156,7 +156,7 @@ if (! $rowid) {
 		$societestatic->admin = $obj->admin;
 		$societestatic->login = $obj->login;
 		$societestatic->email = $obj->email;
-		$societestatic->societe_id = $obj->fk_soc;
+		$societestatic->socid = $obj->fk_soc;
 
 		print '<tr class="oddeven">';
 

From f6aa9bf220fc1dd839c7b1de569ac2d7d358a5bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Nov 2019 20:28:10 +0100
Subject: [PATCH 3/4] Update hierarchy.php

---
 htdocs/user/hierarchy.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index dc990497808..59e39058629 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -98,7 +98,7 @@ else
     	$userstatic->statut=$val['statut'];
         $userstatic->email=$val['email'];
         $userstatic->gender=$val['gender'];
-    	$userstatic->societe_id=$val['fk_soc'];
+    	$userstatic->socid=$val['fk_soc'];
     	$userstatic->admin=$val['admin'];
     	$userstatic->entity=$val['entity'];
     	$userstatic->photo=$val['photo'];

From 88ad997eecd45eb08a404b2b528dc00aafaf406c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?=
 <frederic34@users.noreply.github.com>
Date: Mon, 4 Nov 2019 20:29:33 +0100
Subject: [PATCH 4/4] Update home.php

---
 htdocs/user/home.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index ec742f3e6a9..8840ba698c9 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -144,7 +144,7 @@ if ($resql)
 		$fuserstatic->admin = $obj->admin;
 		$fuserstatic->email = $obj->email;
 		$fuserstatic->skype = $obj->skype;
-		$fuserstatic->societe_id = $obj->fk_soc;
+		$fuserstatic->socid = $obj->fk_soc;
 
 		$companystatic->id=$obj->fk_soc;
 		$companystatic->name=$obj->name;