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

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2020-01-28 20:29:17 +00:00
parent ab0d60065d
commit 1c26139789
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/adherents/class/adherent.class.php
View File

@ -2280,23 +2280,23 @@ class Adherent extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."adherent as a";
$sql.= ", ".MAIN_DB_PREFIX."adherent_type as t";
$sql.= " WHERE a.fk_adherent_type = t.rowid";
if ($mode == 'expired')
if ($mode == 'expired')
{
$sql.= " AND a.statut = 1";
$sql.= " AND a.entity IN (".getEntity('adherent').")";
$sql.= " AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND t.subscription = 1)";
$sql.= " AND a.statut = 1";
$sql.= " AND a.entity IN (".getEntity('adherent').")";
$sql.= " AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND t.subscription = 1)";
}
elseif ($mode == 'shift')
{
$sql.= " AND a.statut = -1";
$sql.= " AND a.entity IN (".getEntity('adherent').")";
$sql.= " AND a.statut = -1";
$sql.= " AND a.entity IN (".getEntity('adherent').")";
}
$resql=$this->db->query($sql);
if ($resql)
{
$langs->load("members");
if ($mode == 'expired') {
$warning_delay = $conf->adherent->subscription->warning_delay/60/60/24;
$label = $langs->trans("MembersWithSubscriptionToReceive");

2
htdocs/index.php
View File

@ -268,7 +268,7 @@ if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS))
DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',
DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',
DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
DOL_URL_ROOT.'/adherents/list.php?statut=-1&mainmenu=members',
DOL_URL_ROOT.'/adherents/list.php?statut=-1&mainmenu=members',
DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',