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

Fix: Can edit dictionnary of payment term and conditions when a module need it.

Browse Source
This commit is contained in:
Laurent Destailleur 2010-08-23 20:32:11 +00:00
parent e804a9949e
commit f8bd212b06
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/admin/dict.php
View File

@ -233,8 +233,8 @@ $tabcond[8] = $conf->societe->enabled;
$tabcond[9] = true; $tabcond[9] = true;
$tabcond[10]= true; $tabcond[10]= true;
$tabcond[11]= true; $tabcond[11]= true;
$tabcond[12]= $conf->facture->enabled||$conf->fournisseur->enabled; $tabcond[12]= $conf->commande->enabled||$conf->propale->enabled||$conf->facture->enabled||$conf->fournisseur->enabled;
$tabcond[13]= $conf->facture->enabled||$conf->fournisseur->enabled; $tabcond[13]= $conf->commande->enabled||$conf->propale->enabled||$conf->facture->enabled||$conf->fournisseur->enabled;
$tabcond[14]= $conf->product->enabled&&$conf->ecotax->enabled; $tabcond[14]= $conf->product->enabled&&$conf->ecotax->enabled;
$tabcond[15]= true; $tabcond[15]= true;
$tabcond[16]= $conf->societe->enabled; $tabcond[16]= $conf->societe->enabled;
@ -737,7 +737,7 @@ if ($_GET["id"])
else else
{ {
/* /*
* Affichage de la liste des dictionnaires * Show list of dictionnary to show
*/ */
$var=true; $var=true;
@ -745,19 +745,35 @@ else
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
//print '<td>'.$langs->trans("Module").'</td>'; //print '<td>'.$langs->trans("Module").'</td>';
print '<td>'.$langs->trans("Dictionnary").'</td>'; print '<td colspan="2">'.$langs->trans("Dictionnary").'</td>';
print '<td>'.$langs->trans("Table").'</td>'; print '<td>'.$langs->trans("Table").'</td>';
print '</tr>'; print '</tr>';
foreach ($taborder as $i) foreach ($taborder as $i)
{ {
if ($tabname[$i] && ! $tabcond[$i]) continue; // If dictionnary and condition not true if ($tabname[$i] && empty($tabcond[$i])) continue;
if ($i) if ($i)
{ {
$var=!$var; $var=!$var;
$value=$tabname[$i]; $value=$tabname[$i];
print '<tr '.$bc[$var].'><td width="30%"><a href="dict.php?id='.$i.'">'.$tablib[$i].'</a></td><td>'.$tabname[$i].'</td></tr>'; print '<tr '.$bc[$var].'><td width="30%">';
if (! empty($tabcond[$i]))
{
print '<a href="dict.php?id='.$i.'">'.$tablib[$i].'</a>';
}
else
{
print $tablib[$i];
}
print '</td>';
print '<td>';
/*if (empty($tabcond[$i]))
{
print info_admin($langs->trans("DictionnaryDisabledSinceNoModuleNeedIt"),1);
}*/
print '</td>';
print '<td>'.$tabname[$i].'</td></tr>';
$lastlineisempty=false; $lastlineisempty=false;
} }
else else
@ -765,7 +781,7 @@ else
if (! $lastlineisempty) if (! $lastlineisempty)
{ {
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td></tr>'; print '<tr '.$bc[$var].'><td width="30%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
$lastlineisempty=true; $lastlineisempty=true;
} }
} }