';
print $formaccounting->select_account($search_accountancy_account, 'search_accountancy_account', 1, array(), 1, 1, 'maxwidth200');
@@ -475,7 +475,7 @@ if ($resql) {
}
// Subledger account
- if ($arrayfields['subledger']['checked']) {
+ if (!empty($arrayfields['subledger']['checked'])) {
print '
';
print ' ';
print $formaccounting->select_auxaccount($search_accountancy_subledger, 'search_accountancy_subledger', 1, 'maxwidth200');
@@ -484,7 +484,7 @@ if ($resql) {
}
// Debit
- if ($arrayfields['debit']['checked']) {
+ if (!empty($arrayfields['debit']['checked'])) {
print ' | ';
print '';
print ' | ';
@@ -535,10 +535,10 @@ if ($resql) {
if ($arrayfields['entry']['checked']) {
print_liste_field_titre($arrayfields['entry']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
}
- if ($arrayfields['account']['checked']) {
+ if (!empty($arrayfields['account']['checked'])) {
print_liste_field_titre($arrayfields['account']['label'], $_SERVER["PHP_SELF"], 'v.accountancy_code', '', $param, '', $sortfield, $sortorder, 'left ');
}
- if ($arrayfields['subledger']['checked']) {
+ if (!empty($arrayfields['subledger']['checked'])) {
print_liste_field_titre($arrayfields['subledger']['label'], $_SERVER["PHP_SELF"], 'v.subledger_account', '', $param, '', $sortfield, $sortorder, 'left ');
}
if ($arrayfields['debit']['checked']) {
@@ -671,7 +671,7 @@ if ($resql) {
}
// Accounting account
- if ($arrayfields['account']['checked']) {
+ if (!empty($arrayfields['account']['checked'])) {
$accountingaccount->fetch('', $obj->accountancy_code, 1);
print ''.$accountingaccount->getNomUrl(0, 1, 1, '', 1).' | ';
@@ -681,7 +681,7 @@ if ($resql) {
}
// Accounting subledger account
- if ($arrayfields['subledger']['checked']) {
+ if (!empty($arrayfields['subledger']['checked'])) {
print ''.length_accounta($obj->subledger_account).' | ';
if (!$i) {
$totalarray['nbfield']++;
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index a9378cefe1d..b5a0c099cff 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -166,7 +166,7 @@ if ($object->id > 0) {
print dol_get_fiche_end();
if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
- $param = '&id='.$object->id.'&socid='.$socid;
+ $param = '&id='.$object->id;
if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
$param .= '&contextpage='.urlencode($contextpage);
}
@@ -174,7 +174,7 @@ if ($object->id > 0) {
$param .= '&limit='.urlencode($limit);
}
- print_barre_liste($langs->trans("ActionsOnResource"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlcenter, '', 0, 1, 1);
+ print_barre_liste($langs->trans("ActionsOnResource"), 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', '', '', '', 0, 1, 1);
// List of all actions
$filters = array();