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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Browse Source 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
This commit is contained in:
Laurent Destailleur 2021-05-03 19:01:47 +02:00
commit cbc481dc60
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/list.php
View File

@ -812,7 +812,7 @@ while ($i < min($num, $limit)) {
print '</td>'; print '</td>';
} else { } else {
print '<td class="nowrap left">'; print '<td class="nowrap left">';
if ($obj->subscription == 'yes') { if (!empty($obj->subscription)) {
print $langs->trans("SubscriptionNotReceived"); print $langs->trans("SubscriptionNotReceived");
if ($obj->statut > 0) print " ".img_warning(); if ($obj->statut > 0) print " ".img_warning();
} else { } else {

4
htdocs/adherents/type.php
View File

@ -477,7 +477,7 @@ if ($rowid > 0) {
$sql .= " AND d.entity IN (".getEntity('adherent').")"; $sql .= " AND d.entity IN (".getEntity('adherent').")";
$sql .= " AND t.rowid = ".$object->id; $sql .= " AND t.rowid = ".$object->id;
if ($sall) { if ($sall) {
$sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall); $sql .= natural_search(array("d.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);
} }
if ($status != '') { if ($status != '') {
$sql .= natural_search('d.statut', $status, 2); $sql .= natural_search('d.statut', $status, 2);
@ -660,7 +660,7 @@ if ($rowid > 0) {
print '</td>'; print '</td>';
} else { } else {
print '<td class="nowrap left">'; print '<td class="nowrap left">';
if ($objp->subscription == 'yes') { if (!empty($objp->subscription)) {
print $langs->trans("SubscriptionNotReceived"); print $langs->trans("SubscriptionNotReceived");
if ($objp->status > 0) print " ".img_warning(); if ($objp->status > 0) print " ".img_warning();
} else { } else {

5
htdocs/core/class/extrafields.class.php
View File

@ -1277,7 +1277,10 @@ class ExtraFields
$out .= '</select>'; $out .= '</select>';
} elseif ($type == 'checkbox') } elseif ($type == 'checkbox')
{ {
$value_arr = explode(',', $value); $value_arr = $value;
if (!is_array($value)) {
$value_arr = explode(',', $value);
}
$out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%'); $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ?null:$param['options']), $value_arr, '', 0, '', 0, '100%');
} elseif ($type == 'radio') } elseif ($type == 'radio')
{ {

12
htdocs/core/lib/company.lib.php
View File

@ -833,12 +833,12 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
//E-mail //E-mail
't.email', 't.email',
); );
//Social media //Social media
foreach ($socialnetworks as $key => $value) { // foreach ($socialnetworks as $key => $value) {
if ($value['active']) { // if ($value['active']) {
$searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'"; // $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
} // }
} // }
if (!$sortorder) $sortorder = "ASC"; if (!$sortorder) $sortorder = "ASC";
if (!$sortfield) $sortfield = "t.lastname"; if (!$sortfield) $sortfield = "t.lastname";

2
htdocs/societe/societecontact.php
View File

@ -329,7 +329,7 @@ if ($id > 0 || !empty($ref))
print '</td>'; print '</td>';
} else { } else {
print '<td class="left nowrap">'; print '<td class="left nowrap">';
if ($objp->subscription == 'yes') if (!empty($objp->subscription))
{ {
print $langs->trans("SubscriptionNotReceived"); print $langs->trans("SubscriptionNotReceived");
if ($objp->statut > 0) print " ".img_warning(); if ($objp->statut > 0) print " ".img_warning();