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

Fix: Navigation works on mtoher and sales representatives tabs

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-07 18:56:20 +00:00
parent d711d90616
commit 1034a33ee8
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/societe/commerciaux.php
View File

@ -21,7 +21,7 @@
/** /**
* \file htdocs/societe/commerciaux.php * \file htdocs/societe/commerciaux.php
* \ingroup societe * \ingroup societe
* \brief Page d'affectations des commerciaux aux societes * \brief Page of links to sales representatives
* \version $Id$ * \version $Id$
*/ */
@ -87,7 +87,10 @@ if($_GET["socid"] && $_GET["delcommid"])
* View * View
*/ */
llxHeader(); $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url);
$form = new Form($db);
if ($_GET["socid"]) if ($_GET["socid"])
{ {
@ -104,25 +107,27 @@ if ($_GET["socid"])
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans('Name').'</td><td colspan="3">'.$soc->nom.'</td></tr>';
print '<tr><td>'; print '<tr><td width="20%">'.$langs->trans('Name').'</td>';
print $langs->trans('CustomerCode').'</td><td width="20%">'; print '<td colspan="3">';
print $soc->code_client; print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode"); print '</td></tr>';
print '<tr>';
print '<td>'.$langs->trans('CustomerCode').'</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
print $soc->code_client;
if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
print '</td>'; print '</td>';
// Prefix
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{ {
print '<td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td>'; print '<td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td>';
} }
else print '<td>&nbsp;</td>'; print '</td>';
print '</tr>'; print '</tr>';
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->address)."</td></tr>"; print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->address)."</td></tr>";
print '<tr><td>'.$langs->trans('Zip').'</td><td>'.$soc->cp."</td>"; print '<tr><td>'.$langs->trans('Zip').'</td><td width="20%">'.$soc->cp."</td>";
print '<td>'.$langs->trans('Town').'</td><td>'.$soc->ville."</td></tr>"; print '<td>'.$langs->trans('Town').'</td><td>'.$soc->ville."</td></tr>";
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'.$soc->pays.'</td>'; print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">'.$soc->pays.'</td>';

20
htdocs/societe/lien.php
View File

@ -89,7 +89,10 @@ if($_GET["socid"] && $_GET["delsocid"])
* View * View
*/ */
llxHeader(); $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url);
$form = new Form($db);
if($_GET["socid"]) if($_GET["socid"])
{ {
@ -107,25 +110,26 @@ if($_GET["socid"])
*/ */
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans('Name').'</td><td colspan="3">'.$soc->nom.'</td></tr>';
print '<tr><td>'; print '<tr><td width="20%">'.$langs->trans('Name').'</td>';
print $langs->trans('CustomerCode').'</td><td width="20%">'; print '<td colspan="3">';
print $form->showrefnav($soc,'socid','',($user->societe_id?0:1),'rowid','nom');
print '</td></tr>';
print '<tr>';
print '<td>'.$langs->trans('CustomerCode').'</td><td'.(empty($conf->global->SOCIETE_USEPREFIX)?' colspan="3"':'').'>';
print $soc->code_client; print $soc->code_client;
if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode"); if ($soc->check_codeclient() <> 0) print ' '.$langs->trans("WrongCustomerCode");
print '</td>'; print '</td>';
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
{ {
print '<td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td>'; print '<td>'.$langs->trans('Prefix').'</td><td>'.$soc->prefix_comm.'</td>';
} }
else print '<td>&nbsp;</td>';
print '</tr>'; print '</tr>';
print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->address)."</td></tr>"; print "<tr><td valign=\"top\">".$langs->trans('Address')."</td><td colspan=\"3\">".nl2br($soc->address)."</td></tr>";
print "<tr><td>".$langs->trans('Zip')."</td><td>".$soc->cp."</td>"; print "<tr><td>".$langs->trans('Zip').'</td><td width="20%">'.$soc->cp."</td>";
print "<td>".$langs->trans('Town')."</td><td>".$soc->ville."</td></tr>"; print "<td>".$langs->trans('Town')."</td><td>".$soc->ville."</td></tr>";
print "<tr><td>".$langs->trans('Country')."</td><td colspan=\"3\">".$soc->pays."</td></tr>"; print "<tr><td>".$langs->trans('Country')."</td><td colspan=\"3\">".$soc->pays."</td></tr>";