diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 5609bb6b598..37a0b9cb71b 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -1116,7 +1116,7 @@ if ($resql)
if (! empty($arrayfields['b.rowid']['checked']))
{
print '| ';
- print "rowid.'&save_lastsearch_values=1">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'account', 'class="classfortooltip"').' '.$objp->rowid." ";
+ print "rowid.'&save_lastsearch_values=1">'.img_object($langs->trans("ShowPayment").': '.$objp->rowid, 'account', 'class="classfortooltip"').' '.$objp->rowid." ";
print ' | ';
if (! $i) $totalarray['nbfield']++;
}
@@ -1126,7 +1126,7 @@ if ($resql)
{
print "";
- //print "rowid."&account=".$objp->fk_account."\">";
+ //print "rowid."&account=".$objp->fk_account."\">";
$reg=array();
preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
if ($reg[1] && $langs->trans($reg[1])!=$reg[1]) print $langs->trans($reg[1]);
@@ -1459,7 +1459,7 @@ if ($resql)
// Transaction reconciliated or edit link
if ($objp->conciliated && $bankaccount->canBeConciliated() > 0) // If line not conciliated and account can be conciliated
{
- print '';
+ print '';
print img_edit();
print '';
}
@@ -1467,13 +1467,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 '';
}
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index 89a05f3e215..5724178e9de 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -2277,7 +2277,7 @@ class AccountLine extends CommonObject
$result='';
$label=$langs->trans("ShowTransaction").': '.$this->rowid;
- $linkstart = '';
+ $linkstart = '';
$linkend='';
$result .= $linkstart;
diff --git a/htdocs/compta/bank/info.php b/htdocs/compta/bank/info.php
index 7eaeb515aa9..ce9f2f5c2dc 100644
--- a/htdocs/compta/bank/info.php
+++ b/htdocs/compta/bank/info.php
@@ -45,7 +45,7 @@ $object->info($id);
$h=0;
-$head[$h][0] = DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$id;
+$head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
$head[$h][1] = $langs->trans("Card");
$h++;
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/line.php
similarity index 99%
rename from htdocs/compta/bank/ligne.php
rename to htdocs/compta/bank/line.php
index 40906bfd455..2b04f83472f 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/line.php
@@ -24,7 +24,7 @@
*/
/**
- * \file htdocs/compta/bank/ligne.php
+ * \file htdocs/compta/bank/line.php
* \ingroup bank
* \brief Page to edit a bank transaction record
*/
@@ -223,7 +223,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
else $sql.=", rappro = ".$rappro;
$sql.= " WHERE rowid = ".$rowid;
- dol_syslog("ligne.php", LOG_DEBUG);
+ dol_syslog("line.php", LOG_DEBUG);
$result = $db->query($sql);
if ($result)
{
@@ -256,7 +256,7 @@ foreach ($cats as $cat) {
$tabs = array(
array(
- DOL_URL_ROOT.'/compta/bank/ligne.php?rowid='.$rowid,
+ DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$rowid,
$langs->trans('Card')
),
array(
@@ -416,7 +416,7 @@ if ($result)
print '';
}
elseif ($links[$key]['type']=='banktransfert') {
- print '';
+ print '';
print img_object($langs->trans('ShowTransaction'), 'payment').' ';
print $langs->trans("TransactionOnTheOtherAccount");
print '';
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index b93f381c555..53cdde900e3 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -616,7 +616,7 @@ else
print ' | '.$type_label.' '.($objp->num_chq?$objp->num_chq:'').$link.' | ';
// Description
- print '';
+ print ' | ';
$reg=array();
preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthese on tente recherche de traduction
if ($reg[1] && $langs->trans($reg[1])!=$reg[1]) print $langs->trans($reg[1]);
@@ -778,7 +778,7 @@ else
if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
{
- print ' | ';
+ print ' | ';
print img_edit();
print " | ";
}
diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php
index 199b1f9c08d..05c1f3a1515 100644
--- a/htdocs/compta/bank/transfer.php
+++ b/htdocs/compta/bank/transfer.php
@@ -120,9 +120,9 @@ if ($action == 'add')
if (! $error) $bank_line_id_to = $accountto->addline($dateo, $typeto, $label, price2num($amountto), '', '', $user);
if (! ($bank_line_id_to > 0)) $error++;
- if (! $error) $result=$accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/ligne.php?rowid=', '(banktransfert)', 'banktransfert');
+ if (! $error) $result=$accountfrom->add_url_line($bank_line_id_from, $bank_line_id_to, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
if (! ($result > 0)) $error++;
- if (! $error) $result=$accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/ligne.php?rowid=', '(banktransfert)', 'banktransfert');
+ if (! $error) $result=$accountto->add_url_line($bank_line_id_to, $bank_line_id_from, DOL_URL_ROOT.'/compta/bank/line.php?rowid=', '(banktransfert)', 'banktransfert');
if (! ($result > 0)) $error++;
if (! $error)
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index d31efcc9df8..b5473ddacb9 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -362,7 +362,7 @@ if ($id > 0 || $ref)
print "";
print $ligne->LibStatut($obj->statut, 2);
print " ";
- print '';
+ print '';
print sprintf("%06s", $obj->rowid);
print ' | ';
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index c930db99012..0e4d28fde2f 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -203,7 +203,7 @@ if ($resql)
print '| ';
- print '';
+ print '';
print img_picto('', 'statut'.$obj->statut).' ';
print substr('000000'.$obj->rowid, -6);
print ' | ';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/line.php
similarity index 95%
rename from htdocs/compta/prelevement/ligne.php
rename to htdocs/compta/prelevement/line.php
index 8b11716bf6f..c9004c04d26 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/line.php
@@ -20,7 +20,7 @@
*/
/**
- * \file htdocs/compta/prelevement/ligne.php
+ * \file htdocs/compta/prelevement/line.php
* \ingroup prelevement
* \brief card of withdraw line
*/
@@ -86,7 +86,7 @@ if ($action == 'confirm_rejet')
$rej->create($user, $id, GETPOST('motif', 'alpha'), $daterej, $lipre->bon_rowid, GETPOST('facturer', 'int'));
- header("Location: ligne.php?id=".$id);
+ header("Location: line.php?id=".$id);
exit;
}
}
@@ -97,7 +97,7 @@ if ($action == 'confirm_rejet')
}
else
{
- header("Location: ligne.php?id=".$id);
+ header("Location: line.php?id=".$id);
exit;
}
}
@@ -112,7 +112,7 @@ $invoicestatic=new Facture($db);
llxHeader('', $langs->trans("StandingOrder"));
$h = 0;
-$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$id;
+$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/line.php?id='.$id;
$head[$h][1] = $langs->trans("Card");
$hselected = $h;
$h++;
@@ -179,7 +179,7 @@ if ($id)
$rej = new RejetPrelevement($db, $user);
- print '