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

Look: Modif esthtiques mineurs

Browse Source
This commit is contained in:
Laurent Destailleur 2008-04-04 12:04:25 +00:00
parent de395a8184
commit 3ad62bc7a1
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/fiche.php
View File

@ -301,6 +301,7 @@ if ($user->rights->societe->contact->creer)
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
$form->select_pays($contact->fk_pays);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input name="phone_pro" type="text" size="18" maxlength="80" value="'.$contact->phone_pro.'"></td>';
@ -382,6 +383,7 @@ if ($user->rights->societe->contact->creer)
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="3">';
$form->select_pays($contact->fk_pays);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
print '<tr><td>'.$langs->trans("PhonePro").'</td><td><input name="phone_pro" type="text" size="18" maxlength="80" value="'.$contact->phone_pro.'"></td>';

25
htdocs/html.form.class.php
View File

@ -182,9 +182,10 @@ class Form
*/
function select_departement($selected='',$pays_code=0)
{
dolibarr_syslog("Form::select_departement selected=$selected, pays_code=$pays_code",LOG_DEBUG);
global $conf,$langs,$user;
dolibarr_syslog("Form::select_departement selected=$selected, pays_code=$pays_code",LOG_DEBUG);
global $conf,$langs;
$langs->load("dict");
$htmlname='departement_id';
@ -243,6 +244,7 @@ class Form
}
}
print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
}
else {
dolibarr_print_error($this->db);
@ -807,7 +809,10 @@ class Form
$i++;
}
}
if ($htmlname != 'none') print '</select>';
if ($htmlname != 'none')
{
print '</select>';
}
return $num;
}
else
@ -1414,7 +1419,7 @@ class Form
*/
function select_conditions_paiements($selected='',$htmlname='condid',$filtertype=-1,$addempty=0)
{
global $langs;
global $langs,$user;
$this->load_cache_conditions_paiements();
@ -1434,6 +1439,7 @@ class Form
print '</option>';
}
print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
}
@ -1658,7 +1664,7 @@ class Form
*/
function select_civilite($selected='')
{
global $conf,$langs;
global $conf,$langs,$user;
$langs->load("dict");
$sql = "SELECT rowid, code, civilite, active FROM ".MAIN_DB_PREFIX."c_civilite";
@ -1691,6 +1697,7 @@ class Form
}
}
print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
}
else
{
@ -1707,7 +1714,7 @@ class Form
*/
function select_forme_juridique($selected='',$pays_code=0)
{
global $conf,$langs;
global $conf,$langs,$user;
$langs->load("dict");
// On recherche les formes juridiques actives des pays actifs
@ -1761,6 +1768,7 @@ class Form
}
}
print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</div>';
}
else
@ -2218,7 +2226,7 @@ class Form
*/
function select_currency($selected='',$htmlname='currency_id')
{
global $conf,$langs;
global $conf,$langs,$user;
$langs->load("dict");
if ($selected=='euro' || $selected=='euros') $selected='EUR'; // Pour compatibilité
@ -2257,6 +2265,7 @@ class Form
}
}
print '</select>';
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
return 0;
}
else {
@ -2767,7 +2776,7 @@ class Form
print "</option>\n";
}
print "</select>\n";
print "</select>";
}

6
htdocs/soc.php
View File

@ -431,6 +431,7 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
$form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript_ajax?' onChange="autofilltownfromzip_save_refresh_create()"':'');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
@ -522,9 +523,11 @@ if ($_POST["getcustomercode"] || $_POST["getsuppliercode"] ||
print '<tr><td>'.$langs->trans("Type").'</td><td>'."\n";
$form->select_array("typent_id",$soc->typent_array(0), $soc->typent_id);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td>';
print '<td>'.$langs->trans("Staff").'</td><td>';
$form->select_array("effectif_id",$soc->effectif_array(0), $soc->effectif_id);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
// Assujeti TVA
@ -786,6 +789,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '<tr><td>'.$langs->trans('Country').'</td><td colspan="3">';
$form->select_pays($soc->pays_id,'pays_id',$conf->use_javascript_ajax?' onChange="autofilltownfromzip_save_refresh_edit()"':'');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
print '<tr><td>'.$langs->trans('State').'</td><td colspan="3">';
@ -880,9 +884,11 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit')
print '<tr><td>'.$langs->trans("Type").'</td><td>';
$form->select_array("typent_id",$soc->typent_array(0), $soc->typent_id);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td>';
print '<td>'.$langs->trans("Staff").'</td><td>';
$form->select_array("effectif_id",$soc->effectif_array(0), $soc->effectif_id);
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
print '</td></tr>';
print '<tr><td align="center" colspan="4">';