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

New: Add option to disable state

Browse Source
This commit is contained in:
Laurent Destailleur 2011-03-26 11:27:04 +00:00
parent 57c45c2442
commit 742e11620f
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/societe/soc.php
View File

@ -762,16 +762,19 @@ else
print '</td></tr>'; print '</td></tr>';
// State // State
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">'; if (empty($conf->global->SOCIETE_DISABLE_STATE))
if ($soc->pays_id)
{ {
$formcompany->select_departement($soc->departement_id,$soc->pays_code); print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
if ($soc->pays_id)
{
$formcompany->select_departement($soc->departement_id,$soc->pays_code);
}
else
{
print $countrynotdefined;
}
print '</td></tr>';
} }
else
{
print $countrynotdefined;
}
print '</td></tr>';
// Phone / Fax // Phone / Fax
print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td>'; print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td>';
@ -1183,10 +1186,13 @@ else
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1); if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>'; print '</td></tr>';
// Department // State
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">'; if (empty($conf->global->SOCIETE_DISABLE_STATE))
$formcompany->select_departement($soc->departement_id,$soc->pays_code); {
print '</td></tr>'; print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
$formcompany->select_departement($soc->departement_id,$soc->pays_code);
print '</td></tr>';
}
// Phone / Fax // Phone / Fax
print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td>'; print '<tr><td>'.$langs->trans('Phone').'</td><td><input type="text" name="tel" value="'.$soc->tel.'"></td>';
@ -1424,8 +1430,8 @@ else
else print ($img?$img.' ':'').$soc->pays; else print ($img?$img.' ':'').$soc->pays;
print '</td></tr>'; print '</td></tr>';
// Department // State
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">'.$soc->departement.'</td>'; if (empty($conf->global->SOCIETE_DISABLE_STATE)) print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">'.$soc->departement.'</td>';
print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->pays_code,0,$soc->id,'AC_TEL').'</td>'; print '<tr><td>'.$langs->trans('Phone').'</td><td>'.dol_print_phone($soc->tel,$soc->pays_code,0,$soc->id,'AC_TEL').'</td>';
print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->pays_code,0,$soc->id,'AC_FAX').'</td></tr>'; print '<td>'.$langs->trans('Fax').'</td><td>'.dol_print_phone($soc->fax,$soc->pays_code,0,$soc->id,'AC_FAX').'</td></tr>';