diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php index 794ce3c8e7c..ff1e7ff8b72 100644 --- a/htdocs/accountancy/class/accountingaccount.class.php +++ b/htdocs/accountancy/class/accountingaccount.class.php @@ -507,7 +507,7 @@ class AccountingAccount extends CommonObject } $label_link = length_accountg($this->account_number); - if ($withlabel) $label_link .= ' - ' . $labeltoshow; + if ($withlabel) $label_link .= ' - ' . ($nourl ? '' : '').$labeltoshow.($nourl ? '' : ''); if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend); if ($withpicto && $withpicto != 2) $result .= ' '; diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php index 1191187a139..727e68346fa 100644 --- a/htdocs/accountancy/class/accountingjournal.class.php +++ b/htdocs/accountancy/class/accountingjournal.class.php @@ -266,7 +266,7 @@ class AccountingJournal extends CommonObject } $label_link = $this->code; - if ($withlabel) $label_link .= ' - '.$langs->transnoentities($this->label); + if ($withlabel) $label_link .= ' - '.($nourl ? '' : '').$langs->transnoentities($this->label).($nourl ? '' : ''); $result .= $linkstart; if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1); diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index a61d29b6a48..dd45d7e59fe 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -1,6 +1,6 @@ - * Copyright (C) 2006-2015 Laurent Destailleur + * Copyright (C) 2006-2020 Laurent Destailleur * Copyright (C) 2007 Patrick Raguin * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2015 Raphaël Doursenaud @@ -678,7 +678,7 @@ if ($type == Categorie::TYPE_MEMBER) print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'adherents', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit); print "\n"; print ''."\n"; @@ -807,7 +807,7 @@ if ($type == Categorie::TYPE_ACCOUNT) print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($accounts); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'account', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Account"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bank', 0, $newcardbutton, '', $limit); print "
'.$langs->trans("Name").'
\n"; print ''."\n"; @@ -872,7 +872,7 @@ if ($type == Categorie::TYPE_PROJECT) print '
'; $param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($objects); $nbtotalofrecords = ''; $newcardbutton = ''; - print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'projects', 0, $newcardbutton, '', $limit); + print_barre_liste($langs->trans("Project"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit); print "
'.$langs->trans("Ref").'
\n"; print ''."\n"; diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php index 26563f98dd4..0bf5bbc6ade 100644 --- a/htdocs/compta/bank/bankentries_list.php +++ b/htdocs/compta/bank/bankentries_list.php @@ -806,7 +806,7 @@ if ($resql) $morehtml = '
'; $morehtml .= ' "; // ' Page '; - $morehtml .= ''; + $morehtml .= ''; $morehtml .= '/'.$nbtotalofpages.' '; $morehtml .= '
'; @@ -1374,7 +1374,7 @@ if ($resql) // Third party if (!empty($arrayfields['bu.label']['checked'])) { - print "'; - else print ''; + else print ''; } elseif ($totalarray['totaldebfield'] == $i) print ''; elseif ($totalarray['totalcredfield'] == $i) print ''; diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php index 21712e9a36f..e220df40e42 100644 --- a/htdocs/compta/bank/categ.php +++ b/htdocs/compta/bank/categ.php @@ -138,7 +138,7 @@ if ($result) { print ""; print ''; } diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php index 963a3edf26f..c5c4464bf41 100644 --- a/htdocs/compta/bank/line.php +++ b/htdocs/compta/bank/line.php @@ -304,14 +304,14 @@ if ($result) print ''; print ''; - dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), -1, 'account', 0); + dol_fiche_head($tabs, 0, $langs->trans('LineRecord'), 0, 'account', 0); $linkback = ''.$langs->trans("BackToList").''; dol_banner_tab($bankline, 'rowid', $linkback); - print '
'; + print '
'; print '
'; print '
'.$langs->trans("Ref").'
"; + print ''; if ($objp->url_id) { $companystatic->id = $objp->url_id; @@ -1520,13 +1520,13 @@ if ($resql) { if ($user->rights->banque->modifier || $user->rights->banque->consolidate) { - print ''; + print ''; print img_edit(); print ''; } else { - print ''; + print ''; print img_view(); print ''; } @@ -1574,7 +1574,7 @@ if ($resql) if ($i == 1) { if ($num < $limit && empty($offset)) print ''.$langs->trans("Total").''.$langs->trans("Totalforthispage").''.$langs->trans("Totalforthispage").''.price(-1 * $totalarray['totaldeb']).''.price($totalarray['totalcred']).'".$objp->label."'; - print ''.img_edit().'  '; + print ''.img_edit().'  '; print ''.img_delete().''; print '
'; diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php index 82728fc693d..6adc1e4ccd2 100644 --- a/htdocs/compta/bank/list.php +++ b/htdocs/compta/bank/list.php @@ -313,14 +313,14 @@ print ''; if (!empty($arrayfields['b.ref']['checked'])) { print ''; } // Label if (!empty($arrayfields['b.label']['checked'])) { print ''; } // Account type @@ -333,7 +333,7 @@ if (!empty($arrayfields['accountype']['checked'])) if (!empty($arrayfields['b.number']['checked'])) { print ''; } // Account number @@ -527,26 +527,28 @@ foreach ($accounts as $key=>$type) // Transactions to reconcile if (!empty($arrayfields['toreconcile']['checked'])) { - print ''; + print ''; if (!$i) $totalarray['nbfield']++; }
'; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - print ''; + print ''; print ''; - if ($objecttmp->rappro) - { - $result = $objecttmp->load_board($user, $objecttmp->id); - if ($result < 0) { - setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); - } else { - print ''.$result->nbtodo.''; - if ($result->nbtodolate) { - print ''; - print ' '.$result->nbtodolate; - print ''; - } - } - } - else - { - print ''.$langs->trans("FeatureDisabled").''; - } - print ''; + + $conciliate = $objecttmp->canBeConciliated(); + if ($conciliate == -2) print ''.$langs->trans("CashAccount").''; + elseif ($conciliate == -3) print ''.$langs->trans("Closed").''; + elseif (empty($objecttmp->rappro)) { + print ''.$langs->trans("ConciliationDisabled").''; + } else { + $result = $objecttmp->load_board($user, $objecttmp->id); + if ($result < 0) { + setEventMessages($objecttmp->error, $objecttmp->errors, 'errors'); + } else { + print ''.$result->nbtodo.''; + if ($result->nbtodolate) { + print ''; + print ' '.$result->nbtodolate; + print ''; + } + } + } + + print '