From 247d950e6a0ff863d6c83729b90418db33bc0ef2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 9 Dec 2022 16:51:06 +0100 Subject: [PATCH] Debug v17 --- htdocs/core/lib/accounting.lib.php | 29 ++++++++++++++++------------- htdocs/langs/en_US/members.lang | 6 +++--- htdocs/public/members/new.php | 12 +++++++----- 3 files changed, 26 insertions(+), 21 deletions(-) diff --git a/htdocs/core/lib/accounting.lib.php b/htdocs/core/lib/accounting.lib.php index 7d4483de6cf..5c1f0b078a3 100644 --- a/htdocs/core/lib/accounting.lib.php +++ b/htdocs/core/lib/accounting.lib.php @@ -274,24 +274,27 @@ function getDefaultDatesForTransfer() { global $db, $conf; + $date_start = ''; + $date_end = ''; $pastmonth = 0; $pastmonthyear = 0; // Period by default on transfer (0: previous month | 1: current month | 2: fiscal year) $periodbydefaultontransfer = (empty($conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER) ? 0 : $conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER); - if ($periodbydefaultontransfer == 2) { - $sql = "SELECT date_start, date_end FROM ".MAIN_DB_PREFIX."accounting_fiscalyear "; + if ($periodbydefaultontransfer == 2) { // fiscal year + $sql = "SELECT date_start, date_end FROM ".MAIN_DB_PREFIX."accounting_fiscalyear"; $sql .= " WHERE date_start < '".$db->idate(dol_now())."' AND date_end > '".$db->idate(dol_now())."'"; $sql .= $db->plimit(1); $res = $db->query($sql); if ($res->num_rows > 0) { - $fiscalYear = $db->fetch_object($res); - $date_start = strtotime($fiscalYear->date_start); - $date_end = strtotime($fiscalYear->date_end); + $obj = $db->fetch_object($res); + + $date_start = $db->jdate($obj->date_start); + $date_end = $db->jdate($obj->date_end); } else { - $month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1); + $month_start = getDolGlobalInt('SOCIETE_FISCAL_MONTH_START', 1); $year_start = dol_print_date(dol_now(), '%Y'); - if ($conf->global->SOCIETE_FISCAL_MONTH_START > dol_print_date(dol_now(), '%m')) { + if ($month_start > dol_print_date(dol_now(), '%m')) { $year_start = $year_start - 1; } $year_end = $year_start + 1; @@ -303,17 +306,17 @@ function getDefaultDatesForTransfer() $date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start); $date_end = dol_get_last_day($year_end, $month_end); } - } elseif ($periodbydefaultontransfer == 1) { - $year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt'); - $pastmonth = strftime("%m", dol_now()); + } elseif ($periodbydefaultontransfer == 1) { // current month + $year_current = (int) dol_print_date(dol_now('gmt'), "%Y", 'gmt'); + $pastmonth = (int) dol_print_date(dol_now('gmt'), '%m', 'gmt'); $pastmonthyear = $year_current; if ($pastmonth == 0) { $pastmonth = 12; $pastmonthyear--; } - } else { - $year_current = dol_print_date(dol_now('gmt'), "%Y", 'gmt'); - $pastmonth = strftime("%m", dol_now()) - 1; + } else { // previous month + $year_current = (int) dol_print_date(dol_now('gmt'), "%Y", 'gmt'); + $pastmonth = (int) dol_print_date(dol_now('gmt'), '%m', 'gmt') - 1; $pastmonthyear = $year_current; if ($pastmonth == 0) { $pastmonth = 12; diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 4cd36aa76fd..71f01b36739 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -74,12 +74,12 @@ MemberTypeCanNotBeDeleted=Member type can not be deleted NewSubscription=New contribution NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s. Subscription=Contribution -AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s -AnyAmountWithoutAdvisedAmount=Any amount +AnyAmountWithAdvisedAmount=Any amount of your choice, recommended %s +AnyAmountWithoutAdvisedAmount=Any amount of your choice CanEditAmountShort=Any amount CanEditAmountShortForValues=recommended, any amount MembershipDuration=Duration -GetMembershipButtonLabel=Get membership +GetMembershipButtonLabel=Join Subscriptions=Contributions SubscriptionLate=Late SubscriptionNotReceived=Contribution never received diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index 7b5acf5c99d..b37cb15d9c0 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -200,7 +200,7 @@ if (empty($reshook) && $action == 'add') { $error++; $errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"))."
\n"; } - $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape(GETPOST('login'))."'"; + $sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login = '".$db->escape(GETPOST('login'))."'"; $result = $db->query($sql); if ($result) { $num = $db->num_rows($result); @@ -779,7 +779,7 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $caneditamount) { print ''; print ' '.$langs->trans("Currency".$conf->currency).' – '; - print $amount>0? $langs->trans("AnyAmountWithAdvisedAmount", $amount, $langs->trans("Currency".$conf->currency)): $langs->trans("AnyAmountWithoutAdvisedAmount"); + print $amount > 0 ? $langs->trans("AnyAmountWithAdvisedAmount", price($amount, 0, $langs, 1, -1, -1, $conf->currency)): $langs->trans("AnyAmountWithoutAdvisedAmount"); print ''; } else { print ''; @@ -815,12 +815,14 @@ if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEW $publiccounters = getDolGlobalString("MEMBER_COUNTERS_ARE_PUBLIC"); - $sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.amount, d.caneditamount, d.vote, d.note, d.duration, d.statut as status, d.morphy, COUNT(a.rowid) AS membercount"; + $sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.amount, d.caneditamount, d.vote, d.note, d.duration, d.statut as status, d.morphy,"; + $sql .= " COUNT(a.rowid) AS membercount"; $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."adherent as a"; - $sql .= " ON d.rowid = a.fk_adherent_type AND a.statut>0"; + $sql .= " ON d.rowid = a.fk_adherent_type AND a.statut > 0"; $sql .= " WHERE d.entity IN (".getEntity('member_type').")"; - $sql .= " AND d.statut=1 GROUP BY d.rowid"; + $sql .= " AND d.statut=1"; + $sql .= " GROUP BY d.rowid, d.libelle, d.subscription, d.amount, d.caneditamount, d.vote, d.note, d.duration, d.statut, d.morphy"; $result = $db->query($sql); if ($result) {