lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12324 from frederic34/patch-13

Browse Source 
replace societe_id by socid
This commit is contained in:
Laurent Destailleur 2019-11-04 20:57:43 +01:00 committed by GitHub
commit aeb2361d2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/salaries/list.php
View File

@ -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;

2
htdocs/stripe/payout.php
View File

@ -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">';

2
htdocs/user/hierarchy.php
View File

@ -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'];

2
htdocs/user/home.php
View File

@ -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;