diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 7ea4fedc0c846e108ded44577356da5f216490c6..769b7de07ef15de3018b18ff8224a481cb6954af 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -292,8 +292,8 @@ if ($result) print '</a>'; } else if ($links[$key]['type']=='company') { - print '<a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$links[$key]['url_id'].'">'; - print img_object($langs->trans('ShowCustomer'),'company').' '; + print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$links[$key]['url_id'].'">'; + print img_object($langs->trans('ShowThirdParty'),'company').' '; print $links[$key]['label']; print '</a>'; } diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php index 9d82834baeb6c02f664b352c76f599980459b708..b9ef13b93e595d3fddddcfd21df3587ded4fe5a7 100644 --- a/htdocs/compta/paiement/class/paiement.class.php +++ b/htdocs/compta/paiement/class/paiement.class.php @@ -386,7 +386,7 @@ class Paiement if (! in_array($fac->thirdparty->id,$linkaddedforthirdparty)) // Not yet done for this thirdparty { $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); $linkaddedforthirdparty[$fac->thirdparty->id]=$fac->thirdparty->id; // Mark as done for this thirdparty } diff --git a/htdocs/compta/prelevement/facturesrejets.php b/htdocs/compta/prelevement/facturesrejets.php index 30dc422d5d27fd47c1d70a5164060279e923345b..c871210436a9a24fbc6a5bab89c37151a6203717 100644 --- a/htdocs/compta/prelevement/facturesrejets.php +++ b/htdocs/compta/prelevement/facturesrejets.php @@ -131,7 +131,7 @@ if ($result) 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"; diff --git a/htdocs/compta/prelevement/rejets.php b/htdocs/compta/prelevement/rejets.php index 3b79241a22b6f655cfb60bc4f029ca97b7c01476..83cf15b85f170991ac6406ce8ca51a5c425567b7 100644 --- a/htdocs/compta/prelevement/rejets.php +++ b/htdocs/compta/prelevement/rejets.php @@ -101,7 +101,7 @@ if ($result) 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 "</tr>\n"; diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php index 29b6b6b51807714fdfbfab95a018d8126dbba451..eea105289d1f05e3a10662696f02d75b160cdd11 100644 --- a/htdocs/product/stats/commande.php +++ b/htdocs/product/stats/commande.php @@ -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 $objp->ref; 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 align=\"center\">"; print dol_print_date($db->jdate($objp->date_commande))."</td>"; diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php index 384b3ee0c8fe5990a13f0f6d4038f752bf22a9e0..5d9f256e3da9d09de15288f4d224456f7704eada 100644 --- a/htdocs/product/stats/commande_fournisseur.php +++ b/htdocs/product/stats/commande_fournisseur.php @@ -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 $objp->ref; 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 align=\"center\">"; print dol_print_date($db->jdate($objp->date_commande))."</td>"; diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php index 04087e907b00395d068cdd7ca783ed3f2fd26b76..0641e2c3b9a4b44054f6a78994ee0ddd9e246e95 100644 --- a/htdocs/product/stats/contrat.php +++ b/htdocs/product/stats/contrat.php @@ -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 $objp->rowid; 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 align=\"center\">"; print dol_print_date($db->jdate($objp->date_contrat))."</td>"; diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php index e11bd1a418946d759b4d6e5a48575221735a2c9d..2d939958fc6edab9fdbb659fe0267d9568f93b00 100644 --- a/htdocs/product/stats/facture.php +++ b/htdocs/product/stats/facture.php @@ -167,7 +167,7 @@ if ($_GET["id"] || $_GET["ref"]) $invoicestatic->ref=$objp->facnumber; print $invoicestatic->getNomUrl(1); 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 align=\"center\">"; print dol_print_date($db->jdate($objp->datef),'day')."</td>"; diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php index b345002e3aa71fdc5d6e2b0282582948ff38267e..a0dd7b1b677621976e929eee70ef5c14df360b71 100644 --- a/htdocs/product/stats/facture_fournisseur.php +++ b/htdocs/product/stats/facture_fournisseur.php @@ -167,7 +167,7 @@ if ($_GET["id"] || $_GET["ref"]) $supplierinvoicestatic->ref=$objp->facnumber; print $supplierinvoicestatic->getNomUrl(1); 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 align=\"center\">"; print dol_print_date($db->jdate($objp->datef))."</td>";