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

Merge pull request #16889 from frederic34/adherent_to_member

Browse Source 
rename files from adherent to member
This commit is contained in:
Laurent Destailleur 2021-03-20 20:37:44 +01:00 committed by GitHub
commit 9900429fd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
htdocs/adherents/admin/adherent.php → htdocs/adherents/admin/member.php
View File

2
htdocs/adherents/admin/adherent_emails.php → htdocs/adherents/admin/member_emails.php
View File

@ -24,7 +24,7 @@
*/ */
/** /**
* \file htdocs/adherents/admin/adherent.php * \file htdocs/adherents/admin/member_emails.php
* \ingroup member * \ingroup member
* \brief Page to setup the module Foundation * \brief Page to setup the module Foundation
*/ */

2
htdocs/adherents/admin/adherent_extrafields.php → htdocs/adherents/admin/member_extrafields.php
View File

@ -19,7 +19,7 @@
*/ */
/** /**
* \file htdocs/adherents/admin/adherent_extrafields.php * \file htdocs/adherents/admin/member_extrafields.php
* \ingroup member * \ingroup member
* \brief Page to setup extra fields of members * \brief Page to setup extra fields of members
*/ */

2
htdocs/adherents/admin/adherent_type_extrafields.php → htdocs/adherents/admin/member_type_extrafields.php
View File

@ -22,7 +22,7 @@
*/ */
/** /**
* \file htdocs/adherents/admin/adherent_type_extrafields.php * \file htdocs/adherents/admin/member_type_extrafields.php
* \ingroup member * \ingroup member
* \brief Page to setup extra fields of members * \brief Page to setup extra fields of members
*/ */

4
htdocs/core/class/conf.class.php
View File

@ -851,6 +851,10 @@ class Conf
if (isset($this->projet) && !isset($this->project)) { if (isset($this->projet) && !isset($this->project)) {
$this->project = $this->projet; $this->project = $this->projet;
} }
// member is new use, adherent is old use still initialised
if (isset($this->adherent) && !isset($this->member)) {
$this->member = $this->adherent;
}
// Object $mc // Object $mc
if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) { if (!defined('NOREQUIREMC') && !empty($this->multicompany->enabled)) {

8
htdocs/core/lib/member.lib.php
View File

@ -177,12 +177,12 @@ function member_admin_prepare_head()
$h = 0; $h = 0;
$head = array(); $head = array();
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent.php'; $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member.php';
$head[$h][1] = $langs->trans("Miscellaneous"); $head[$h][1] = $langs->trans("Miscellaneous");
$head[$h][2] = 'general'; $head[$h][2] = 'general';
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_emails.php'; $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_emails.php';
$head[$h][1] = $langs->trans("EMails"); $head[$h][1] = $langs->trans("EMails");
$head[$h][2] = 'emails'; $head[$h][2] = 'emails';
$h++; $h++;
@ -193,12 +193,12 @@ function member_admin_prepare_head()
// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab // $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to remove a tab
complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin'); complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin');
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_extrafields.php'; $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsMember"); $head[$h][1] = $langs->trans("ExtraFieldsMember");
$head[$h][2] = 'attributes'; $head[$h][2] = 'attributes';
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/adherents/admin/adherent_type_extrafields.php'; $head[$h][0] = DOL_URL_ROOT.'/adherents/admin/member_type_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsMemberType"); $head[$h][1] = $langs->trans("ExtraFieldsMemberType");
$head[$h][2] = 'attributes_type'; $head[$h][2] = 'attributes_type';
$h++; $h++;

2
htdocs/core/modules/modAdherent.class.php
View File

@ -66,7 +66,7 @@ class modAdherent extends DolibarrModules
); );
// Config pages // Config pages
$this->config_page_url = array("adherent.php@adherents"); $this->config_page_url = array("member.php@adherents");
// Dependencies // Dependencies
$this->hidden = false; // A condition to hide module $this->hidden = false; // A condition to hide module