lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Fix option to disable customer features

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-26 13:18:01 +00:00
parent 900ed92e3a
commit 0143eb7b0a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/societe/class/societe.class.php
View File

@ -1349,7 +1349,7 @@ class Societe extends CommonObject
* @param maxlen Max length of text * @param maxlen Max length of text
* @return string String with URL * @return string String with URL
*/ */
function getNomUrl($withpicto=0,$option='customer',$maxlen=0) function getNomUrl($withpicto=0,$option='',$maxlen=0)
{ {
global $conf,$langs; global $conf,$langs;
@ -1358,7 +1358,7 @@ class Societe extends CommonObject
if ($option == 'customer' || $option == 'compta') if ($option == 'customer' || $option == 'compta')
{ {
if ($this->client == 1 && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) // Only customer if (($this->client == 1 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) // Only customer
{ {
$lien = '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$this->id; $lien = '<a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$this->id;
} }

15
htdocs/societe/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2010 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -52,7 +52,7 @@ print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td valign="top" width="30%" class="notopnoleft">'; print '<tr><td valign="top" width="30%" class="notopnoleft">';
/* /*
* Zone recherche tiers * Search area
*/ */
$rowspan=2; $rowspan=2;
print '<form method="post" action="'.DOL_URL_ROOT.'/societe/societe.php">'; print '<form method="post" action="'.DOL_URL_ROOT.'/societe/societe.php">';
@ -72,7 +72,7 @@ print "</table></form><br>";
/* /*
* Nombre de tiers * Statistics area
*/ */
$third = array(); $third = array();
$total=0; $total=0;
@ -181,17 +181,20 @@ if ($result)
print '<td align="center">'; print '<td align="center">';
if ($thirdparty_static->client==1 || $thirdparty_static->client==3) if ($thirdparty_static->client==1 || $thirdparty_static->client==3)
{ {
print "<a href=\"".DOL_URL_ROOT."/comm/fiche.php?socid=".$thirdparty_static->id."\">".$langs->trans("Customer")."</a>\n"; $thirdparty_static->name=$langs->trans("Customer");
print $thirdparty_static->getNomUrl(0,'customer');
} }
if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / "; if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / ";
if (($thirdparty_static->client==2 || $thirdparty_static->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) if (($thirdparty_static->client==2 || $thirdparty_static->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
{ {
print "<a href=\"".DOL_URL_ROOT."/comm/prospect/fiche.php?socid=".$thirdparty_static->id."\">".$langs->trans("Prospect")."</a>\n"; $thirdparty_static->name=$langs->trans("Prospect");
print $thirdparty_static->getNomUrl(0,'prospect');
} }
if ($conf->fournisseur->enabled && $thirdparty_static->fournisseur) if ($conf->fournisseur->enabled && $thirdparty_static->fournisseur)
{ {
if ($thirdparty_static->client) print " / "; if ($thirdparty_static->client) print " / ";
print '<a href="'.DOL_URL_ROOT.'/fourn/fiche.php?socid='.$thirdparty_static->id.'">'.$langs->trans("Supplier").'</a>'; $thirdparty_static->name=$langs->trans("Supplier");
print $thirdparty_static->getNomUrl(0,'supplier');
} }
print '</td>'; print '</td>';
// Last modified date // Last modified date