Fix: Bad links
This commit is contained in:
parent
5c9300ac39
commit
d8004865b1
@ -292,7 +292,7 @@ if ($result)
|
|||||||
print '</a>';
|
print '</a>';
|
||||||
}
|
}
|
||||||
else if ($links[$key]['type']=='company') {
|
else if ($links[$key]['type']=='company') {
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$links[$key]['url_id'].'">';
|
print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$links[$key]['url_id'].'">';
|
||||||
print img_object($langs->trans('ShowCustomer'),'company').' ';
|
print img_object($langs->trans('ShowCustomer'),'company').' ';
|
||||||
print $links[$key]['label'];
|
print $links[$key]['label'];
|
||||||
print '</a>';
|
print '</a>';
|
||||||
|
|||||||
@ -386,7 +386,7 @@ class Paiement
|
|||||||
if (! in_array($fac->thirdparty->id,$linkaddedforthirdparty)) // Not yet done for this thirdparty
|
if (! in_array($fac->thirdparty->id,$linkaddedforthirdparty)) // Not yet done for this thirdparty
|
||||||
{
|
{
|
||||||
$result=$acc->add_url_line($bank_line_id, $fac->thirdparty->id,
|
$result=$acc->add_url_line($bank_line_id, $fac->thirdparty->id,
|
||||||
DOL_URL_ROOT.'/compta/fiche.php?socid=', $fac->thirdparty->nom, 'company');
|
DOL_URL_ROOT.'/comm/fiche.php?socid=', $fac->thirdparty->nom, 'company');
|
||||||
if ($result <= 0) dol_print_error($this->db);
|
if ($result <= 0) dol_print_error($this->db);
|
||||||
$linkaddedforthirdparty[$fac->thirdparty->id]=$fac->thirdparty->id; // Mark as done for this thirdparty
|
$linkaddedforthirdparty[$fac->thirdparty->id]=$fac->thirdparty->id; // Mark as done for this thirdparty
|
||||||
}
|
}
|
||||||
|
|||||||
@ -46,7 +46,7 @@ if ($_GET["id"])
|
|||||||
|
|
||||||
if ($bon->fetch($_GET["id"]) == 0)
|
if ($bon->fetch($_GET["id"]) == 0)
|
||||||
{
|
{
|
||||||
$head = prelevement_prepare_head($bon);
|
$head = prelevement_prepare_head($bon);
|
||||||
dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipt"), '', 'payment');
|
dol_fiche_head($head, 'invoices', $langs->trans("WithdrawalReceipt"), '', 'payment');
|
||||||
|
|
||||||
print '<table class="border" width="100%">';
|
print '<table class="border" width="100%">';
|
||||||
@ -65,7 +65,7 @@ if ($_GET["id"])
|
|||||||
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
|
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
|
||||||
print '<td>'.$bon->getLibStatut(1).'</td>';
|
print '<td>'.$bon->getLibStatut(1).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
if($bon->date_trans <> 0)
|
if($bon->date_trans <> 0)
|
||||||
{
|
{
|
||||||
$muser = new User($db);
|
$muser = new User($db);
|
||||||
@ -84,7 +84,7 @@ if ($_GET["id"])
|
|||||||
print dol_print_date($bon->date_credit,'day');
|
print dol_print_date($bon->date_credit,'day');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
@ -157,7 +157,7 @@ if ($result)
|
|||||||
|
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
|
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
|
||||||
|
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->socid.'">';
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">';
|
||||||
print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."</a></td>\n";
|
print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."</a></td>\n";
|
||||||
|
|
||||||
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
|
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
|
||||||
|
|||||||
@ -131,7 +131,7 @@ if ($result)
|
|||||||
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->facnumber."</a></td>\n";
|
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->facnumber."</a></td>\n";
|
||||||
|
|
||||||
|
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
|
||||||
|
|
||||||
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
|
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
|
||||||
|
|
||||||
|
|||||||
@ -68,7 +68,7 @@ if ($_GET["id"])
|
|||||||
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
|
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
|
||||||
print '<td>'.$bon->getLibStatut(1).'</td>';
|
print '<td>'.$bon->getLibStatut(1).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
if($bon->date_trans <> 0)
|
if($bon->date_trans <> 0)
|
||||||
{
|
{
|
||||||
$muser = new User($db);
|
$muser = new User($db);
|
||||||
@ -87,7 +87,7 @@ if ($_GET["id"])
|
|||||||
print dol_print_date($bon->date_credit,'day');
|
print dol_print_date($bon->date_credit,'day');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
@ -136,7 +136,7 @@ if ($resql)
|
|||||||
|
|
||||||
$var=True;
|
$var=True;
|
||||||
$total = 0;
|
$total = 0;
|
||||||
|
|
||||||
while ($i < $num)
|
while ($i < $num)
|
||||||
{
|
{
|
||||||
$obj = $db->fetch_object($resql);
|
$obj = $db->fetch_object($resql);
|
||||||
@ -147,7 +147,7 @@ if ($resql)
|
|||||||
|
|
||||||
print substr('000000'.$obj->rowid, -6);
|
print substr('000000'.$obj->rowid, -6);
|
||||||
print '</a></td>';
|
print '</a></td>';
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
|
||||||
|
|
||||||
print '<td align="right">'.price($obj->amount)."</td>\n";
|
print '<td align="right">'.price($obj->amount)."</td>\n";
|
||||||
print '<td>'.$rej->motifs[$obj->motif].'</td>';
|
print '<td>'.$rej->motifs[$obj->motif].'</td>';
|
||||||
|
|||||||
@ -72,7 +72,7 @@ if ($_GET["id"])
|
|||||||
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
|
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
|
||||||
print '<td>'.$bon->getLibStatut(1).'</td>';
|
print '<td>'.$bon->getLibStatut(1).'</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
if($bon->date_trans <> 0)
|
if($bon->date_trans <> 0)
|
||||||
{
|
{
|
||||||
$muser = new User($db);
|
$muser = new User($db);
|
||||||
@ -91,7 +91,7 @@ if ($_GET["id"])
|
|||||||
print dol_print_date($bon->date_credit,'day');
|
print dol_print_date($bon->date_credit,'day');
|
||||||
print '</td></tr>';
|
print '</td></tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
print '</table>';
|
print '</table>';
|
||||||
|
|
||||||
print '</div>';
|
print '</div>';
|
||||||
@ -164,15 +164,15 @@ if ($result)
|
|||||||
$obj = $db->fetch_object($result);
|
$obj = $db->fetch_object($result);
|
||||||
|
|
||||||
print "<tr $bc[$var]><td>";
|
print "<tr $bc[$var]><td>";
|
||||||
|
|
||||||
print $ligne->LibStatut($obj->statut,2);
|
print $ligne->LibStatut($obj->statut,2);
|
||||||
print " ";
|
print " ";
|
||||||
|
|
||||||
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
|
print '<a href="'.DOL_URL_ROOT.'/compta/prelevement/ligne.php?id='.$obj->rowid.'">';
|
||||||
print substr('000000'.$obj->rowid, -6);
|
print substr('000000'.$obj->rowid, -6);
|
||||||
print '</a></td>';
|
print '</a></td>';
|
||||||
|
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
|
||||||
|
|
||||||
print '<td align="center">'.price($obj->amount)."</td>\n";
|
print '<td align="center">'.price($obj->amount)."</td>\n";
|
||||||
|
|
||||||
|
|||||||
@ -101,7 +101,7 @@ if ($result)
|
|||||||
|
|
||||||
print substr('000000'.$obj->rowid, -6)."</a></td>";
|
print substr('000000'.$obj->rowid, -6)."</a></td>";
|
||||||
|
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
|
||||||
|
|
||||||
print '<td>'.$rej->motifs[$obj->motif].'</td>';
|
print '<td>'.$rej->motifs[$obj->motif].'</td>';
|
||||||
print "</tr>\n";
|
print "</tr>\n";
|
||||||
|
|||||||
@ -164,7 +164,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
|
print '<td><a href="'.DOL_URL_ROOT.'/commande/fiche.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
|
||||||
print $objp->ref;
|
print $objp->ref;
|
||||||
print "</a></td>\n";
|
print "</a></td>\n";
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
||||||
print "<td>".$objp->code_client."</td>\n";
|
print "<td>".$objp->code_client."</td>\n";
|
||||||
print "<td align=\"center\">";
|
print "<td align=\"center\">";
|
||||||
print dol_print_date($db->jdate($objp->date_commande))."</td>";
|
print dol_print_date($db->jdate($objp->date_commande))."</td>";
|
||||||
|
|||||||
@ -158,7 +158,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
|
print '<td><a href="'.DOL_URL_ROOT.'/fourn/commande/fiche.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
|
||||||
print $objp->ref;
|
print $objp->ref;
|
||||||
print "</a></td>\n";
|
print "</a></td>\n";
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
||||||
print "<td>".$objp->code_client."</td>\n";
|
print "<td>".$objp->code_client."</td>\n";
|
||||||
print "<td align=\"center\">";
|
print "<td align=\"center\">";
|
||||||
print dol_print_date($db->jdate($objp->date_commande))."</td>";
|
print dol_print_date($db->jdate($objp->date_commande))."</td>";
|
||||||
|
|||||||
@ -172,7 +172,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
|
print '<td><a href="'.DOL_URL_ROOT.'/contrat/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
|
||||||
print $objp->rowid;
|
print $objp->rowid;
|
||||||
print "</a></td>\n";
|
print "</a></td>\n";
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
||||||
print "<td>".$objp->code_client."</td>\n";
|
print "<td>".$objp->code_client."</td>\n";
|
||||||
print "<td align=\"center\">";
|
print "<td align=\"center\">";
|
||||||
print dol_print_date($db->jdate($objp->date_contrat))."</td>";
|
print dol_print_date($db->jdate($objp->date_contrat))."</td>";
|
||||||
|
|||||||
@ -167,7 +167,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
$invoicestatic->ref=$objp->facnumber;
|
$invoicestatic->ref=$objp->facnumber;
|
||||||
print $invoicestatic->getNomUrl(1);
|
print $invoicestatic->getNomUrl(1);
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
print '<td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
||||||
print "<td>".$objp->code_client."</td>\n";
|
print "<td>".$objp->code_client."</td>\n";
|
||||||
print "<td align=\"center\">";
|
print "<td align=\"center\">";
|
||||||
print dol_print_date($db->jdate($objp->datef),'day')."</td>";
|
print dol_print_date($db->jdate($objp->datef),'day')."</td>";
|
||||||
|
|||||||
@ -167,7 +167,7 @@ if ($_GET["id"] || $_GET["ref"])
|
|||||||
$supplierinvoicestatic->ref=$objp->facnumber;
|
$supplierinvoicestatic->ref=$objp->facnumber;
|
||||||
print $supplierinvoicestatic->getNomUrl(1);
|
print $supplierinvoicestatic->getNomUrl(1);
|
||||||
print "</td>\n";
|
print "</td>\n";
|
||||||
print '<td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
print '<td><a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
|
||||||
print "<td>".$objp->code_client."</td>\n";
|
print "<td>".$objp->code_client."</td>\n";
|
||||||
print "<td align=\"center\">";
|
print "<td align=\"center\">";
|
||||||
print dol_print_date($db->jdate($objp->datef))."</td>";
|
print dol_print_date($db->jdate($objp->datef))."</td>";
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user